Bump versions, require Xerces >= 2.7 for getTextContent

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3402 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index 3a7da4a..18346fa 100644 (file)
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -54,8 +54,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,4,1,0\r
- PRODUCTVERSION 2,4,1,0\r
+ FILEVERSION 2,4,2,0\r
+ PRODUCTVERSION 2,4,2,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -73,7 +73,7 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"\r
-            VALUE "FileVersion", "2, 4, 1, 0\0"\r
+            VALUE "FileVersion", "2, 4, 2, 0\0"\r
 #ifdef SHIBSP_LITE\r
             VALUE "InternalName", "adfs-lite\0"\r
 #else\r
@@ -87,8 +87,8 @@ BEGIN
             VALUE "OriginalFilename", "adfs.so\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.4.1\0"\r
-            VALUE "ProductVersion", "2, 4, 1, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.4.2\0"\r
+            VALUE "ProductVersion", "2, 4, 2, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc
index 1e0517c..ea88567 100644 (file)
--- a/apache/mod_shib_13.rc
+++ b/apache/mod_shib_13.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,1,0
- PRODUCTVERSION 2,4,1,0
+ FILEVERSION 2,4,2,0
+ PRODUCTVERSION 2,4,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"
-            VALUE "FileVersion", "2, 4, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 2, 0\0"
             VALUE "InternalName", "mod_shib_13\0"
             VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_13.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.4.1\0"
-            VALUE "ProductVersion", "2, 4, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4.2\0"
+            VALUE "ProductVersion", "2, 4, 2, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
index d7ed13b..831823b 100644 (file)
--- a/apache/mod_shib_20.rc
+++ b/apache/mod_shib_20.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,1,0
- PRODUCTVERSION 2,4,1,0
+ FILEVERSION 2,4,2,0
+ PRODUCTVERSION 2,4,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"
-            VALUE "FileVersion", "2, 4, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 2, 0\0"
             VALUE "InternalName", "mod_shib_20\0"
             VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_20.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.4.1\0"
-            VALUE "ProductVersion", "2, 4, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4.2\0"
+            VALUE "ProductVersion", "2, 4, 2, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
index 0be06ac..af878e4 100644 (file)
--- a/apache/mod_shib_22.rc
+++ b/apache/mod_shib_22.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,1,0
- PRODUCTVERSION 2,4,1,0
+ FILEVERSION 2,4,2,0
+ PRODUCTVERSION 2,4,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"
-            VALUE "FileVersion", "2, 4, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 2, 0\0"
             VALUE "InternalName", "mod_shib_22\0"
             VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "mod_shib_22.so\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.4.1\0"
-            VALUE "ProductVersion", "2, 4, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4.2\0"
+            VALUE "ProductVersion", "2, 4, 2, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/config_win32.h b/config_win32.h
index 0b1f94d..71b5711 100644 (file)
--- a/config_win32.h
+++ b/config_win32.h
@@ -112,13 +112,13 @@
 #define PACKAGE_NAME "shibboleth"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 2.4.1"
+#define PACKAGE_STRING "shibboleth 2.4.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "shibboleth"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.4.1"
+#define PACKAGE_VERSION "2.4.2"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -131,7 +131,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "2.4.1"
+#define VERSION "2.4.2"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/configure.ac b/configure.ac
index 969fddb..318fca0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.4.1],[https://bugs.internet2.edu/],[shibboleth])
+AC_INIT([shibboleth],[2.4.2],[https://bugs.internet2.edu/],[shibboleth])
 AC_CONFIG_SRCDIR(shibsp)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
@@ -200,13 +200,13 @@ AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,AC_MSG_ERROR([unable to find xerces heade
 AC_MSG_CHECKING([Xerces version])
 AC_PREPROC_IFELSE(
     [AC_LANG_PROGRAM([#include <xercesc/util/XercesVersion.hpp>],
-[#if  _XERCES_VERSION != 20600
+[#if  _XERCES_VERSION >= 20700
 int i = 0;
 #else
-#error cannot use version 2.6.0
+#error version 2.7.0 or above required
 #endif])],
     [AC_MSG_RESULT(OK)],
-    [AC_MSG_FAILURE([Xerces-C v2.6.0 has bugs that inhibit use with signed XML, please use a newer version])])
+    [AC_MSG_FAILURE([Xerces-C v2.7.0 or higher is required, v3.x preferred])])
 AC_LINK_IFELSE(
     [AC_LANG_PROGRAM([[#include <xercesc/util/PlatformUtils.hpp>]],[[xercesc::XMLPlatformUtils::Initialize()]])],
     ,[AC_MSG_ERROR([unable to link with Xerces])])

diff --git a/fastcgi/shibauthorizer.rc b/fastcgi/shibauthorizer.rc
index d8bb82b..e19ccd4 100644 (file)
--- a/fastcgi/shibauthorizer.rc
+++ b/fastcgi/shibauthorizer.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,4,1,0\r
- PRODUCTVERSION 2,4,1,0\r
+ FILEVERSION 2,4,2,0\r
+ PRODUCTVERSION 2,4,2,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0"\r
-            VALUE "FileVersion", "2, 4, 1, 0\0"\r
+            VALUE "FileVersion", "2, 4, 2, 0\0"\r
             VALUE "InternalName", "shibauthorizer\0"\r
             VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibauthorizer.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.4.1\0"\r
-            VALUE "ProductVersion", "2, 4, 1, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.4.2\0"\r
+            VALUE "ProductVersion", "2, 4, 2, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc
index b3a18d5..cdc6c4e 100644 (file)
--- a/fastcgi/shibresponder.rc
+++ b/fastcgi/shibresponder.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,4,1,0\r
- PRODUCTVERSION 2,4,1,0\r
+ FILEVERSION 2,4,2,0\r
+ PRODUCTVERSION 2,4,2,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth FastCGI Responder\0"\r
-            VALUE "FileVersion", "2, 4, 1, 0\0"\r
+            VALUE "FileVersion", "2, 4, 2, 0\0"\r
             VALUE "InternalName", "shibresponder\0"\r
             VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibresponder.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.4.1\0"\r
-            VALUE "ProductVersion", "2, 4, 1, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.4.2\0"\r
+            VALUE "ProductVersion", "2, 4, 2, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc
index 5369cf5..786879d 100644 (file)
--- a/isapi_shib/isapi_shib.rc
+++ b/isapi_shib/isapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,1,0
- PRODUCTVERSION 2,4,1,0
+ FILEVERSION 2,4,2,0
+ PRODUCTVERSION 2,4,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0"
-            VALUE "FileVersion", "2, 4, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 2, 0\0"
             VALUE "InternalName", "isapi_shib\0"
             VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "isapi_shib.dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.4.1\0"
-            VALUE "ProductVersion", "2, 4, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4.2\0"
+            VALUE "ProductVersion", "2, 4, 2, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc
index b451b54..7319285 100644 (file)
--- a/memcache-store/memcache-store.rc
+++ b/memcache-store/memcache-store.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,1,0
- PRODUCTVERSION 2,4,1,0
+ FILEVERSION 2,4,2,0
+ PRODUCTVERSION 2,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0"
-            VALUE "FileVersion", "2, 4, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 2, 0\0"
             VALUE "InternalName", "memcache-store\0"
             VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
             VALUE "OriginalFilename", "memcache-store.so\0"
-            VALUE "ProductName", "Shibboleth 2.4.1\0"
-            VALUE "ProductVersion", "2, 4, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4.2\0"
+            VALUE "ProductVersion", "2, 4, 2, 0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc
index adaf1ca..22cc7a7 100644 (file)
--- a/nsapi_shib/nsapi_shib.rc
+++ b/nsapi_shib/nsapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,1,0
- PRODUCTVERSION 2,4,1,0
+ FILEVERSION 2,4,2,0
+ PRODUCTVERSION 2,4,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth NSAPI Extension\0"
-            VALUE "FileVersion", "2, 4, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 2, 0\0"
             VALUE "InternalName", "nsapi_shib\0"
             VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "nsapi_shib.dll\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 2.4.1\0"
-            VALUE "ProductVersion", "2, 4, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4.2\0"
+            VALUE "ProductVersion", "2, 4, 2, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc
index fb91e14..e12a849 100644 (file)
--- a/odbc-store/odbc-store.rc
+++ b/odbc-store/odbc-store.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,1,0
- PRODUCTVERSION 2,4,1,0
+ FILEVERSION 2,4,2,0
+ PRODUCTVERSION 2,4,2,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Internet2\0"
             VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0"
-            VALUE "FileVersion", "2, 4, 1, 0\0"
+            VALUE "FileVersion", "2, 4, 2, 0\0"
             VALUE "InternalName", "odbc-store\0"
             VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
             VALUE "OriginalFilename", "odbc-store.so\0"
-            VALUE "ProductName", "Shibboleth 2.4.1\0"
-            VALUE "ProductVersion", "2, 4, 1, 0\0"
+            VALUE "ProductName", "Shibboleth 2.4.2\0"
+            VALUE "ProductVersion", "2, 4, 2, 0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/shibd/shibd.rc b/shibd/shibd.rc
index 6abbb49..6e51922 100644 (file)
--- a/shibd/shibd.rc
+++ b/shibd/shibd.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,4,1,0\r
- PRODUCTVERSION 2,4,1,0\r
+ FILEVERSION 2,4,2,0\r
+ PRODUCTVERSION 2,4,2,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -47,14 +47,14 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
             VALUE "FileDescription", "Shibboleth Daemon Service\0"\r
-            VALUE "FileVersion", "2, 4, 1, 0\0"\r
+            VALUE "FileVersion", "2, 4, 2, 0\0"\r
             VALUE "InternalName", "shibd\0"\r
             VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "shibd.exe\0"\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.4.1\0"\r
-            VALUE "ProductVersion", "2, 4, 1, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.4.2\0"\r
+            VALUE "ProductVersion", "2, 4, 2, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 03e551f..4bd9dbe 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -217,9 +217,9 @@ libshibsp_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = -version-info 5:1:0
+libshibsp_la_LDFLAGS = -version-info 5:2:0
 libshibsp_la_LIBADD = $(XMLSEC_LIBS)
-libshibsp_lite_la_LDFLAGS = -version-info 5:1:0
+libshibsp_lite_la_LDFLAGS = -version-info 5:2:0
 libshibsp_lite_la_LIBADD = $(LITE_LIBS)
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 

diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index 15022f3..e2ea857 100644 (file)
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,4,1,0\r
- PRODUCTVERSION 2,4,1,0\r
+ FILEVERSION 1,4,2,0\r
+ PRODUCTVERSION 2,4,2,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -51,7 +51,7 @@ BEGIN
 #else\r
             VALUE "FileDescription", "Shibboleth SP Library\0"\r
 #endif\r
-            VALUE "FileVersion", "1, 4, 0, 0\0"\r
+            VALUE "FileVersion", "1, 4, 2, 0\0"\r
 #ifdef SHIBSP_LITE\r
 #ifdef _DEBUG\r
             VALUE "InternalName", "shibsp-lite1_4D\0"\r
@@ -81,8 +81,8 @@ BEGIN
 #endif\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "Shibboleth 2.4.1\0"\r
-            VALUE "ProductVersion", "2, 4, 1, 0\0"\r
+            VALUE "ProductName", "Shibboleth 2.4.2\0"\r
+            VALUE "ProductVersion", "2, 4, 2, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/shibsp/version.h b/shibsp/version.h
index 78a1a0f..d56aebf 100644 (file)
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -39,7 +39,7 @@
 
 #define SHIBSP_VERSION_MAJOR 1
 #define SHIBSP_VERSION_MINOR 4
-#define SHIBSP_VERSION_REVISION 1
+#define SHIBSP_VERSION_REVISION 2
 
 /** DO NOT MODIFY BELOW THIS LINE */