diff --git a/src/relaxng/settings.rnc b/src/relaxng/settings.rnc
index eb27d85916..f7a69d0960 100644
--- a/src/relaxng/settings.rnc
+++ b/src/relaxng/settings.rnc
@@ -7,9 +7,15 @@ element settings {
 
   element cutoff {
     (element weight { xsd:double } | attribute weight { xsd:double })? &
-    (element weight_avg { xsd:double } | attribute weight_avg { xsd:double })?
+    (element weight_avg { xsd:double } | attribute weight_avg { xsd:double })? &
+    (element energy_neutron { xsd:double } | attribute energy_neutron { xsd:double })? &
+    (element energy_photon { xsd:double } | attribute energy_photon { xsd:double })? &
+    (element energy_electron { xsd:double } | attribute energy_electron { xsd:double })? &
+    (element energy_positron { xsd:double } | attribute energy_positron { xsd:double })?
   }? &
 
+  element electron_treatment { ( "led" | "ttb" ) }? &
+
   element energy_grid { ( "nuclide" | "log" | "logarithm" | "logarithmic" | "material-union" | "union" ) }? &
 
   element energy_mode { ( "continuous-energy" | "ce" | "CE" | "multi-group" | "mg" | "MG" ) }? &
@@ -55,6 +61,8 @@ element settings {
 
   element particles { xsd:positiveInteger }? &
 
+  element photon_transport { xsd:boolean }? &
+
   element ptables { xsd:boolean }? &
 
   element dagmc { xsd:boolean }? &
@@ -78,8 +86,8 @@ element settings {
           element z { distribution }? &
           element r { distribution }? &
           element theta { distribution }? &
-          element phi { distribution }? & 
-          element origin { list { xsd:double, xsd:double, xsd:double } }? 
+          element phi { distribution }? &
+          element origin { list { xsd:double, xsd:double, xsd:double } }?
         }? &
         element angle {
           (element type { xsd:string } | attribute type { xsd:string }) &
@@ -88,8 +96,7 @@ element settings {
           element mu { distribution }? &
           element phi { distribution }?
         }? &
-        element energy { distribution }? &
-        (element write_initial { xsd:boolean } | attribute write_initial { xsd:boolean })?
+        element energy { distribution }?
       distribution =
         (element type { xsd:string { maxLength = "16" } } |
           attribute type { xsd:string { maxLength = "16" } }) &
@@ -165,6 +172,8 @@ element settings {
       attribute upper_right { list { xsd:double+ } })
   }* &
 
+  element write_initial_source { xsd:boolean }? &
+
   element resonance_scattering {
     (element enable { xsd:boolean } | attribute enable { xsd:boolean })? &
     (element method { xsd:string } | attribute method { xsd:string })? &
diff --git a/src/relaxng/settings.rng b/src/relaxng/settings.rng
index 0c825d0d8b..96ad830c03 100644
--- a/src/relaxng/settings.rng
+++ b/src/relaxng/settings.rng
@@ -39,9 +39,57 @@
               </attribute>
             </choice>
           </optional>
+          <optional>
+            <choice>
+              <element name="energy_neutron">
+                <data type="double"/>
+              </element>
+              <attribute name="energy_neutron">
+                <data type="double"/>
+              </attribute>
+            </choice>
+          </optional>
+          <optional>
+            <choice>
+              <element name="energy_photon">
+                <data type="double"/>
+              </element>
+              <attribute name="energy_photon">
+                <data type="double"/>
+              </attribute>
+            </choice>
+          </optional>
+          <optional>
+            <choice>
+              <element name="energy_electron">
+                <data type="double"/>
+              </element>
+              <attribute name="energy_electron">
+                <data type="double"/>
+              </attribute>
+            </choice>
+          </optional>
+          <optional>
+            <choice>
+              <element name="energy_positron">
+                <data type="double"/>
+              </element>
+              <attribute name="energy_positron">
+                <data type="double"/>
+              </attribute>
+            </choice>
+          </optional>
         </interleave>
       </element>
     </optional>
+    <optional>
+      <element name="electron_treatment">
+        <choice>
+          <value>led</value>
+          <value>ttb</value>
+        </choice>
+      </element>
+    </optional>
     <optional>
       <element name="energy_grid">
         <choice>
@@ -249,6 +297,11 @@
         <data type="positiveInteger"/>
       </element>
     </optional>
+    <optional>
+      <element name="photon_transport">
+        <data type="boolean"/>
+      </element>
+    </optional>
     <optional>
       <element name="ptables">
         <data type="boolean"/>
@@ -422,16 +475,6 @@
                   <ref name="distribution"/>
                 </element>
               </optional>
-              <optional>
-                <choice>
-                  <element name="write_initial">
-                    <data type="boolean"/>
-                  </element>
-                  <attribute name="write_initial">
-                    <data type="boolean"/>
-                  </attribute>
-                </choice>
-              </optional>
             </interleave>
           </start>
           <define name="distribution">
@@ -743,6 +786,11 @@
         </interleave>
       </element>
     </zeroOrMore>
+    <optional>
+      <element name="write_initial_source">
+        <data type="boolean"/>
+      </element>
+    </optional>
     <optional>
       <element name="resonance_scattering">
         <interleave>
diff --git a/src/relaxng/tallies.rnc b/src/relaxng/tallies.rnc
index ec511481f6..3d504a66c8 100644
--- a/src/relaxng/tallies.rnc
+++ b/src/relaxng/tallies.rnc
@@ -51,11 +51,11 @@ element tallies {
       ( (element type { ( "cell" | "cellfrom" | "cellborn" | "material" |
           "universe" | "surface" | "distribcell" | "mesh" | "energy" |
           "energyout" | "mu" | "polar" | "azimuthal" | "delayedgroup" |
-          "energyfunction" | "meshsurface") } |
+          "energyfunction" | "meshsurface" | "cellinstance") } |
          attribute type { ( "cell" | "cellfrom" | "cellborn" | "material" |
           "universe" | "surface" | "distribcell" | "mesh" | "energy" |
           "energyout" | "mu" | "polar" | "azimuthal" | "delayedgroup" |
-          "energyfunction" | "meshsurface") }) &
+          "energyfunction" | "meshsurface" | "cellinstance") }) &
         (element bins { list { xsd:double+ } } |
           attribute bins { list { xsd:double+ } })
       ) |
diff --git a/src/relaxng/tallies.rng b/src/relaxng/tallies.rng
index 98a48eeb85..350c3cb4aa 100644
--- a/src/relaxng/tallies.rng
+++ b/src/relaxng/tallies.rng
@@ -245,6 +245,7 @@
                     <value>delayedgroup</value>
                     <value>energyfunction</value>
                     <value>meshsurface</value>
+                    <value>cellinstance</value>
                   </choice>
                 </element>
                 <attribute name="type">
@@ -265,6 +266,7 @@
                     <value>delayedgroup</value>
                     <value>energyfunction</value>
                     <value>meshsurface</value>
+                    <value>cellinstance</value>
                   </choice>
                 </attribute>
               </choice>