diff --git a/build/windows-full-release.bat b/build/windows-full-release.bat
index 33673a468..90772474b 100644
--- a/build/windows-full-release.bat
+++ b/build/windows-full-release.bat
@@ -17,14 +17,26 @@ set "tmp=%2"
 
 :No2
 
+copy library\fhir-dev.inc library\fhir-status.inc
+
 call build\windows-libraries.bat %tmp%
 
 call build\windows-fhirserver.bat %tmp%
 
-exec\64\fhirserver.exe -tests -test-settings exec\64\fhir-tests.ini
+pause
 
-if errorlevel 1 goto Quit
+rem exec\64\fhirserver.exe -tests -test-settings exec\64\fhir-tests.ini
+
+rem if errorlevel 1 goto Quit
+
+pause
+
+copy library\fhir-prod.inc library\fhir-status.inc
+
+pause
 
 call build\windows-release %1 %tmp%
 
+copy library\fhir-dev.inc library\fhir-status.inc
+
 :Quit
\ No newline at end of file
diff --git a/dependencies/FMM/FastMM4.pas b/dependencies/FMM/FastMM4.pas
index 0b2a068e9..c461af4fd 100644
--- a/dependencies/FMM/FastMM4.pas
+++ b/dependencies/FMM/FastMM4.pas
@@ -19149,7 +19149,7 @@ function CheckCanInstallMemoryManager: Boolean;
   {Has another MM been set, or has the Embarcadero MM been used? If so, this
    file is not the first unit in the uses clause of the project's .dpr file.}
 
-  if IsMemoryManagerSet then
+  if IsMemoryManagerSet and false then
   begin
     {When using runtime packages, another library may already have installed
      FastMM: Silently ignore the installation request.}
diff --git a/install/install-tk.iss b/install/install-tk.iss
index 5e9e803f9..0044ca3c4 100644
--- a/install/install-tk.iss
+++ b/install/install-tk.iss
@@ -3,11 +3,11 @@
 ; AppID can never be changed as subsequent installations require the same installation ID each time
 AppID=FHIRToolkit
 AppName=Health Intersections FHIR Toolkit
-AppVerName=FHIRToolkit v3.3.10
+AppVerName=FHIRToolkit v3.1.11
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirtoolkit-win64-3.3.10
+OutputBaseFilename=fhirtoolkit-win64-3.1.11
 Compression=lzma2/ultra64
 
 ; 64 bit
@@ -32,11 +32,11 @@ UninstallFilesDir={app}\uninstall
 ; win2000+ add/remove programs support
 AppPublisher=Health Intersections P/L
 AppPublisherURL=http://www.healthintersections.com.au
-AppVersion=3.3.10
+AppVersion=3.1.11
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+
-VersionInfoVersion=3.3.10.0
+VersionInfoVersion=3.1.11.0
 
 ; dialog support
 LicenseFile=..\license
diff --git a/install/install.iss b/install/install.iss
index a0659bb18..fce7bb91d 100644
--- a/install/install.iss
+++ b/install/install.iss
@@ -3,11 +3,11 @@
 ; AppID can never be changed as subsequent installations require the same installation ID each time
 AppID=FHIRServer
 AppName=Health Intersections FHIR Server
-AppVerName=FHIRServer v3.3.10
+AppVerName=FHIRServer v3.1.11
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirserver-win64-3.3.10
+OutputBaseFilename=fhirserver-win64-3.1.11
 Compression=lzma2/ultra64
 
 ; 64 bit
@@ -34,11 +34,11 @@ UninstallFilesDir={app}\uninstall
 ; win2000+ add/remove programs support
 AppPublisher=Health Intersections P/L
 AppPublisherURL=http://www.healthintersections.com.au
-AppVersion=3.3.10
+AppVersion=3.1.11
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+
-VersionInfoVersion=3.3.10.0
+VersionInfoVersion=3.1.11.0
 
 ; dialog support
 LicenseFile=..\license
diff --git a/library/fhir-status.inc b/library/fhir-status.inc
index a17814ff3..4a809a60f 100644
--- a/library/fhir-status.inc
+++ b/library/fhir-status.inc
@@ -6,9 +6,9 @@
 
 // do not make changes in the file fhir-status.inc - it is overwritten by either fhir-dev.inc or fhir-prod.inc by the build scripts 
 
-{$C+} // assertions on - this is the important one - turns object tracking on and off consistently
-{$I+} // IO checking on - though this is probably useless?
+{$C-} // assertions off - this is the important one - turns object tracking off consistently
+{$I-} // IO checking off 
 {$Q-} // overflow checking off - these are always off; doesn't run with them on
 {$R-} // range checking off - these are always off; doesn't run with them on
-{$OPTIMIZATION OFF} // all optimizations off for production
-{$D+} // debugging info on for development
+{$OPTIMIZATION LEVEL3} // level 3 optimizations for production
+{$D-} // debugging info off for production
diff --git a/library/version.inc b/library/version.inc
index d1cb9bfa5..d047c9079 100644
--- a/library/version.inc
+++ b/library/version.inc
@@ -1,3 +1,3 @@
- FHIR_CODE_FULL_VERSION = '3.3.10';
- FHIR_CODE_RELEASE_DATE = '2024-03-03';
- FHIR_CODE_RELEASE_DATETIME = '20240303230308.010Z';
+ FHIR_CODE_FULL_VERSION = '3.1.11';
+ FHIR_CODE_RELEASE_DATE = '2024-03-09';
+ FHIR_CODE_RELEASE_DATETIME = '20240309051040.707Z';
diff --git a/server/fhirconsole.lpi b/server/fhirconsole.lpi
index 4175751c1..8d6953449 100644
--- a/server/fhirconsole.lpi
+++ b/server/fhirconsole.lpi
@@ -17,9 +17,9 @@
     </General>
     <VersionInfo>
       <MajorVersionNr Value="3"/>
-      <RevisionNr Value="10"/>
+      <RevisionNr Value="11"/>
       <Attributes pvaDebug="False"/>
-      <MinorVersionNr Value="3"/>
+      <MinorVersionNr Value="1"/>
     </VersionInfo>
     <BuildModes Count="8">
       <Item1 Name="default" Default="True"/>
diff --git a/server/fhirserver.dproj b/server/fhirserver.dproj
index 4ab610854..54d9ce5dc 100644
--- a/server/fhirserver.dproj
+++ b/server/fhirserver.dproj
@@ -91,8 +91,8 @@
     <VerInfo_Keys>CompanyName=;FileVersion=2.1.3.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
     <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
     <VerInfo_MajorVer>3</VerInfo_MajorVer>
-    <VerInfo_MinorVer>3</VerInfo_MinorVer>
-    <VerInfo_Release>10</VerInfo_Release>
+    <VerInfo_MinorVer>1</VerInfo_MinorVer>
+    <VerInfo_Release>11</VerInfo_Release>
     <VerInfo_Debug>false</VerInfo_Debug>
   </PropertyGroup>
   <PropertyGroup Condition="&apos;$(Base_Win32)&apos;!=&apos;&apos;">
@@ -167,9 +167,9 @@
     <DCC_RangeChecking>true</DCC_RangeChecking>
     <DCC_DebugDCUs>false</DCC_DebugDCUs>
     <VerInfo_MajorVer>3</VerInfo_MajorVer>
-    <VerInfo_Release>10</VerInfo_Release>
+    <VerInfo_Release>11</VerInfo_Release>
     <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
-    <VerInfo_MinorVer>3</VerInfo_MinorVer>
+    <VerInfo_MinorVer>1</VerInfo_MinorVer>
     <VerInfo_Debug>false</VerInfo_Debug>
   </PropertyGroup>
   <PropertyGroup Condition="&apos;$(Cfg_2)&apos;!=&apos;&apos;">
diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi
index 700e8fb19..e09cb8ab0 100644
--- a/server/fhirserver.lpi
+++ b/server/fhirserver.lpi
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="12"/>
@@ -19,8 +18,9 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="3"/>
-      <MinorVersionNr Value="3"/>
-      <RevisionNr Value="10"/>
+      <MinorVersionNr Value="1"/>
+      <RevisionNr Value="11"/>
+      <Attributes pvaDebug="False"/>
     </VersionInfo>
     <BuildModes Count="7">
       <Item1 Name="default" Default="True"/>
@@ -49,13 +49,14 @@
             <SmartLinkUnit Value="True"/>
             <Checks>
               <IOChecks Value="True"/>
-              <RangeChecks Value="True"/>
-              <OverflowChecks Value="True"/>
               <StackChecks Value="True"/>
             </Checks>
             <VerifyObjMethodCallValidity Value="True"/>
             <TargetCPU Value="x86_64"/>
             <TargetOS Value="win64"/>
+            <Optimizations>
+              <OptimizationLevel Value="0"/>
+            </Optimizations>
           </CodeGeneration>
           <Linking>
             <Debugging>
@@ -88,7 +89,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
-            <Libraries Value="\usr\local\lib64\"/>
+            <Libraries Value="\usr\local\lib64"/>
             <OtherUnitFiles Value="..\library\fsl\tests;..\library\fhir\tests;..\library\fhir4\tests;..\library\fhir4b\tests;..\library\fhir5\tests;..\library\ftx\tests;..\library\fxver\tests;..\library\cda\tests;..\library\v2\tests;..\library\fdb\tests;modules;tests;admin;..\library\fcomp\tests;tx"/>
             <UnitOutputDirectory Value="lib\$(BuildMode)"/>
           </SearchPaths>
@@ -189,11 +190,6 @@
             <OtherUnitFiles Value="..\library\fsl\tests;..\library\fhir\tests;..\library\fhir4\tests;..\library\fhir4b\tests;..\library\fhir5\tests;..\library\ftx\tests;..\library\fxver\tests;..\library\cda\tests;..\library\v2\tests;..\library\fdb\tests;modules;tests;admin;..\library\fcomp\tests;tx"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
-          <Parsing>
-            <SyntaxOptions>
-              <IncludeAssertionCode Value="True"/>
-            </SyntaxOptions>
-          </Parsing>
           <CodeGeneration>
             <SmartLinkUnit Value="True"/>
             <RelocatableUnit Value="True"/>
@@ -280,7 +276,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);../library"/>
-            <Libraries Value="/usr/local/lib64/;/tmp/openssl/lib/;/tmp/openssl/"/>
+            <Libraries Value="/usr/local/lib64;/tmp/openssl/lib;/tmp/openssl"/>
             <OtherUnitFiles Value="../library/fsl/tests;../library/fhir/tests;../library/fhir4/tests;../library/fhir4b/tests;../library/fhir5/tests;../library/ftx/tests;../library/fxver/tests;../library/cda/tests;../library/v2/tests;../library/fdb/tests;modules;tests;admin;../library/fcomp/tests;tx"/>
             <UnitOutputDirectory Value="lib/$(BuildMode)"/>
           </SearchPaths>
@@ -785,7 +781,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir);../library"/>
-      <Libraries Value="/usr/local/lib64/;/tmp/openssl/lib/;/tmp/openssl/"/>
+      <Libraries Value="/usr/local/lib64;/tmp/openssl/lib;/tmp/openssl"/>
       <OtherUnitFiles Value="../library/fsl/tests;../library/fhir/tests;../library/fhir4/tests;../library/fhir4b/tests;../library/fhir5/tests;../library/ftx/tests;../library/fxver/tests;../library/cda/tests;../library/v2/tests;../library/fdb/tests;modules;tests;admin;../library/fcomp/tests;tx"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
@@ -990,7 +986,7 @@
         <Name Value="EPackageCrawlerException"/>
       </Item50>
       <Item51>
-        <Name Value="&lt;Unknown Class>"/>
+        <Name Value="&lt;Unknown Class&gt;"/>
       </Item51>
       <Item52>
         <Name Value="EDateFormatError"/>
diff --git a/toolkit2/fhirtoolkit.lpi b/toolkit2/fhirtoolkit.lpi
index 326a868b7..338fba880 100644
--- a/toolkit2/fhirtoolkit.lpi
+++ b/toolkit2/fhirtoolkit.lpi
@@ -16,8 +16,8 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="3"/>
-      <MinorVersionNr Value="3"/>
-      <RevisionNr Value="10"/>
+      <MinorVersionNr Value="1"/>
+      <RevisionNr Value="11"/>
       <Attributes pvaDebug="False"/>
     </VersionInfo>
     <BuildModes>