diff --git a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Choices.hs b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Choices.hs
index 39c372474fb..9e9fa85af0f 100644
--- a/code/drasil-example/glassbr/lib/Drasil/GlassBR/Choices.hs
+++ b/code/drasil-example/glassbr/lib/Drasil/GlassBR/Choices.hs
@@ -1,5 +1,6 @@
 module Drasil.GlassBR.Choices where
 
+import Language.Drasil (mkQuantDef, SimpleQDef, ExprC(..), LiteralC(..))
 import Language.Drasil.Code (Choices(..), defaultChoices, Comments(..),
   Verbosity(..), ConstraintBehaviour(..), ImplementationType(..), Lang(..),
   Logging(..), Modularity(..), Structure(..), ConstantStructure(..),
@@ -8,6 +9,8 @@ import Language.Drasil.Code (Choices(..), defaultChoices, Comments(..),
 import Utils.Drasil (RelativeFile, relativeFile)
 
 import Drasil.GlassBR.ModuleDefs (allMods)
+import Drasil.GlassBR.Unitals (aspectRatio, standOffDist, stressDistFac,
+  demand, eqTNTWeight, dimlessLoad, sdfTol, tolLoad, interpY, interpZ)
 
 choices :: Choices
 choices = defaultChoices {
@@ -20,8 +23,21 @@ choices = defaultChoices {
     [SampleInput "../../datafiles/glassbr/sampleInput.txt", ReadME],
   srsConstraints = makeConstraints Exception Exception,
   defaultConfigFiles = configFp,
-  extraMods = allMods
+  extraMods = allMods,
+  handWiredDefs = [strDisFacQD, demandQD, tolPreQD]
 }
 
+strDisFacQD :: SimpleQDef
+strDisFacQD = mkQuantDef stressDistFac
+  $ apply interpZ [str "SDF.txt", sy aspectRatio, sy dimlessLoad]
+
+demandQD :: SimpleQDef
+demandQD = mkQuantDef demand
+  $ apply interpY [str "TSD.txt", sy standOffDist, sy eqTNTWeight]
+
+tolPreQD :: SimpleQDef
+tolPreQD = mkQuantDef tolLoad
+  $ apply interpY [str "SDF.txt", sy aspectRatio, sy sdfTol]
+
 configFp :: [RelativeFile]
 configFp = map relativeFile ["SDF.txt", "TSD.txt"]
diff --git a/code/drasil-example/glassbr/lib/Drasil/GlassBR/DataDefs.hs b/code/drasil-example/glassbr/lib/Drasil/GlassBR/DataDefs.hs
index 82784d5725b..ea86cf9c8b4 100644
--- a/code/drasil-example/glassbr/lib/Drasil/GlassBR/DataDefs.hs
+++ b/code/drasil-example/glassbr/lib/Drasil/GlassBR/DataDefs.hs
@@ -1,8 +1,7 @@
 module Drasil.GlassBR.DataDefs (dataDefs, aspRat, glaTyFac, glaTyFacQD, gtfRef,
-  hFromt, hFromtQD, loadDFDD, standOffDis, eqTNTWDD, calofDemand, aGrtrThanB,
+  hFromt, hFromtQD, loadDFDD, standOffDis, eqTNTWDD, aGrtrThanB,
   arRef, hRef, stdVals) where
 
-import Control.Lens ((^.))
 import Prelude hiding (log, exp, sqrt)
 
 import Drasil.Database (HasUID)
@@ -11,12 +10,10 @@ import Theory.Drasil (DataDefinition, ddE)
 import qualified Language.Drasil.Sentence.Combinators as S
 import Drasil.Sentence.Combinators (definedIn', definedIn)
 
-import Data.Drasil.Concepts.Math (parameter)
 import Data.Drasil.Concepts.PhysicalProperties (dimension)
 
 import Drasil.GlassBR.Assumptions (assumpSV, assumpLDFC)
 import Drasil.GlassBR.Concepts (annealed, fullyT, glass, heatS)
-import Drasil.GlassBR.LabelledContent (demandVsSDFig)
 import Drasil.GlassBR.References (astm2009)
 import Drasil.GlassBR.Unitals
 
@@ -25,7 +22,7 @@ import Drasil.GlassBR.Unitals
 ----------------------
 
 dataDefs :: [DataDefinition]
-dataDefs = [hFromt, loadDFDD, glaTyFac, standOffDis, aspRat, eqTNTWDD, calofDemand]
+dataDefs = [hFromt, loadDFDD, glaTyFac, standOffDis, aspRat, eqTNTWDD]
 
 {--}
 
@@ -103,17 +100,6 @@ eqTNTWQD = mkQuantDef eqTNTWeight eqTNTWEq
 eqTNTWDD :: DataDefinition
 eqTNTWDD = ddE eqTNTWQD [dRef astm2009] Nothing "eqTNTW" []
 
-{--}
-
-calofDemandEq :: Expr
-calofDemandEq = apply interpY [str "TSD.txt", sy standOffDist, sy eqTNTWeight]
-
-calofDemandQD :: SimpleQDef
-calofDemandQD = mkQuantDef demand calofDemandEq
-
-calofDemand :: DataDefinition
-calofDemand = ddE calofDemandQD [dRef astm2009] Nothing "calofDemand" [calofDemandDesc]
-
 -- Additional Notes --
 aGrtrThanB :: Sentence
 aGrtrThanB = ch plateLen `S.and_` ch plateWidth `S.are`
@@ -128,15 +114,6 @@ hsGlass = glassTypeHelper heatS
 glassTypeHelper :: CI -> Sentence
 glassTypeHelper t = short t `S.is` phrase t +:+. phrase glass
 
-calofDemandDesc :: Sentence
-calofDemandDesc =
-  foldlSent [ch demand `sC` EmptyS `S.or_` phrase demandq `sC` EmptyS `S.isThe`
-  (demandq ^. defn), S "obtained from", refS demandVsSDFig,
-  S "by interpolation using", phrase standOffDist, sParen (ch standOffDist)
-  `S.and_` ch eqTNTWeight, S "as" +:+. plural parameter, ch eqTNTWeight,
-  S "is defined in" +:+. refS eqTNTWDD, ch standOffDist `S.isThe`
-  phrase standOffDist, S "as defined in", refS standOffDis]
-
 hMin :: Sentence
 hMin = ch nomThick `S.is` S "a function that maps from the nominal thickness"
   +:+. (sParen (ch minThick) `S.toThe` phrase minThick)
diff --git a/code/drasil-example/glassbr/lib/Drasil/GlassBR/IMods.hs b/code/drasil-example/glassbr/lib/Drasil/GlassBR/IMods.hs
index bdf59e54fe3..98930969dd1 100644
--- a/code/drasil-example/glassbr/lib/Drasil/GlassBR/IMods.hs
+++ b/code/drasil-example/glassbr/lib/Drasil/GlassBR/IMods.hs
@@ -3,28 +3,26 @@ module Drasil.GlassBR.IMods (symb, iMods, pbIsSafe, lrIsSafe, instModIntro) wher
 import Control.Lens ((^.))
 import Prelude hiding (exp)
 
-import Drasil.Database (HasUID)
 import Drasil.Sentence.Combinators (definedIn', definedIn)
 import Language.Drasil
 import qualified Language.Drasil.Development as D
-import Language.Drasil.Chunk.Concept.NamedCombinators
+import Language.Drasil.Chunk.Concept.NamedCombinators (the)
 import qualified Language.Drasil.Sentence.Combinators as S
 import Theory.Drasil (InstanceModel, imNoDeriv, qwC, qwUC, equationalModelN, output)
 
 import Data.Drasil.Citations (campidelli)
-import Data.Drasil.Concepts.Documentation (goal, user, datum)
-import Data.Drasil.SI_Units
+import Data.Drasil.Concepts.Documentation (goal, user)
+import Data.Drasil.SI_Units (kilogram, metre)
 
-import Drasil.GlassBR.DataDefs (aGrtrThanB, arRef, calofDemand, glaTyFac,
+import Drasil.GlassBR.DataDefs (aGrtrThanB, glaTyFac,
   gtfRef, hRef, loadDFDD, stdVals)
-import Drasil.GlassBR.LabelledContent (dimlessloadVsARFig)
 import Drasil.GlassBR.Goals (willBreakGS)
 import Drasil.GlassBR.References (astm2009, beasonEtAl1998)
 import Drasil.GlassBR.Unitals
 
 iMods :: [InstanceModel]
-iMods = [risk, strDisFac, nonFL, dimLL, tolPre, tolStrDisFac, probOfBreak,
-  calofCapacity, pbIsSafe, lrIsSafe]
+iMods = [risk, nonFL, dimLL, tolStrDisFac, probOfBreak, calofCapacity,
+  pbIsSafe, lrIsSafe]
 
 symb :: [UnitalChunk]
 symb = [ucuc plateLen metre, ucuc plateWidth metre, ucuc charWeight kilogram,
@@ -34,9 +32,6 @@ abInputConstraints :: [(DefinedQuantityDict, Maybe (RealInterval Expr Expr))]
 abInputConstraints = [qwC plateLen   $ UpFrom  (Exc, exactDbl 0),
                       qwC plateWidth $ Bounded (Exc, exactDbl 0) (Inc, sy plateLen)]
 
-aspectRatioConstraint :: RealInterval Expr Expr
-aspectRatioConstraint = UpFrom (Inc, exactDbl 1)
-
 probConstraint :: RealInterval Expr Expr
 probConstraint = Bounded (Inc, exactDbl 0) (Inc, exactDbl 1)
 
@@ -47,7 +42,7 @@ risk = imNoDeriv (equationalModelN (riskFun ^. term) riskQD)
   (qwUC modElas : qwUC loadDF : qwUC stressDistFac :
     map qwUC [sflawParamK, sflawParamM, minThick] ++ abInputConstraints)
     riskFun [] [dRef astm2009, dRefInfo beasonEtAl1998 $ Equation [4, 5],
-    dRefInfo campidelli $ Equation [14]] "riskFun" [aGrtrThanB, hRef, ldfRef, jRef]
+    dRefInfo campidelli $ Equation [14]] "riskFun" [aGrtrThanB, hRef, ldfRef]
 
 -- FIXME [4] !!!
 riskQD :: SimpleQDef
@@ -57,28 +52,11 @@ riskQD = mkQuantDef riskFun ((sy sflawParamK $/
 
 {--}
 
-strDisFac :: InstanceModel
-strDisFac = imNoDeriv (equationalModelN (stressDistFac ^. term) strDisFacQD)
-  (qwC aspectRatio aspectRatioConstraint : [qwUC dimlessLoad]) (dqdWr stressDistFac)
-  [Bounded (Inc, sy stressDistFacMin) (Inc, sy stressDistFacMax)]
-  [dRef astm2009] "stressDistFac"
-  [interpolating stressDistFac dimlessloadVsARFig, arRef, qHtRef]
-
-strDisFacQD :: SimpleQDef
-strDisFacQD = mkQuantDef stressDistFac strDisFacEq
-
-strDisFacEq :: Expr
--- strDisFacEq = apply (sy stressDistFac)
---   [sy dimlessLoad, sy aspectRatio]
-strDisFacEq = apply interpZ [str "SDF.txt", sy aspectRatio, sy dimlessLoad]
-
-{--}
-
 nonFL :: InstanceModel
 nonFL = imNoDeriv (equationalModelN (nonFactorL ^. term) nonFLQD)
   (qwUC tolLoad : qwUC modElas : qwUC minThick : abInputConstraints)
   (dqdWr nonFactorL) [] [dRef astm2009] "nFL"
-  [qHtTlTolRef, stdVals [modElas], hRef, aGrtrThanB]
+  [stdVals [modElas], hRef, aGrtrThanB]
 
 nonFLEq :: Expr
 nonFLEq = (sy tolLoad $* sy modElas) $* (sy minThick $^ exactDbl 4) $/
@@ -93,7 +71,7 @@ dimLL :: InstanceModel
 dimLL = imNoDeriv (equationalModelN (dimlessLoad ^. term) dimLLQD)
   (qwUC demand : qwUC modElas : qwUC minThick : qwUC gTF : abInputConstraints)
   dimlessLoad [] [dRef astm2009, dRefInfo campidelli $ Equation [7]]
-  "dimlessLoad" [qRef, aGrtrThanB, stdVals [modElas], hRef, gtfRef]
+  "dimlessLoad" [aGrtrThanB, stdVals [modElas], hRef, gtfRef]
 
 dimLLEq :: Expr
 dimLLEq = sy demand $* square (sy plateLen $* sy plateWidth)
@@ -104,21 +82,6 @@ dimLLQD = mkQuantDef dimlessLoad dimLLEq
 
 {--}
 
-tolPre :: InstanceModel
-tolPre = imNoDeriv (equationalModelN (tolLoad ^. term) tolPreQD)
-  [qwC aspectRatio aspectRatioConstraint, qwUC $ tolStrDisFac ^. output] tolLoad []
-  [dRef astm2009] "tolLoad" [interpolating tolLoad dimlessloadVsARFig, arRef,
-    jtolRef]
-
-tolPreEq :: Expr
---tolPreEq = apply (sy tolLoad) [sy sdfTol, (sy plateLen) / (sy plateWidth)]
-tolPreEq = apply interpY [str "SDF.txt", sy aspectRatio, sy sdfTol]
-
-tolPreQD :: SimpleQDef
-tolPreQD = mkQuantDef tolLoad tolPreEq
-
-{--}
-
 tolStrDisFac :: InstanceModel
 tolStrDisFac = imNoDeriv (equationalModelN (sdfTol ^. term) tolStrDisFacQD)
   ((loadDF, Nothing) : qwC pbTol probConstraint : qwUC modElas : abInputConstraints ++
@@ -169,7 +132,7 @@ lrIsSafe = imNoDeriv (equationalModelN (nounPhraseSP "Safety Req-LR") lrIsSafeQD
   [qwC lRe $ UpFrom (Exc, exactDbl 0), qwC demand $ UpFrom (Exc, exactDbl 0)]
   isSafeLR []
   [dRef astm2009] "isSafeLR"
-  [lrIsSafeDesc, capRef, qRef]
+  [lrIsSafeDesc, capRef]
 
 lrIsSafeQD :: SimpleQDef
 lrIsSafeQD = mkQuantDef isSafeLR (sy lRe $> sy demand)
@@ -191,9 +154,6 @@ lrCap = ch lRe +:+. S "is also called capacity"
 pbTolUsr :: Sentence
 pbTolUsr = ch pbTol `S.is` S "entered by the" +:+. phrase user
 
-qRef :: Sentence
-qRef = ch demand `S.isThe` (demandq ^. defn) `sC` S "as given in" +:+. refS calofDemand
-
 lrIsSafeDesc :: Sentence
 lrIsSafeDesc = iModDesc isSafeLR
   (ch isSafePb +:+ fromSource pbIsSafe `S.and_` ch isSafeLR)
@@ -202,19 +162,9 @@ pbIsSafeDesc :: Sentence
 pbIsSafeDesc = iModDesc isSafePb
   (ch isSafePb `S.and_` ch isSafeLR +:+ fromSource lrIsSafe)
 
-capRef, jRef, jtolRef, ldfRef, nonFLRef, probBRRef, qHtRef, qHtTlTolRef,
-  riskRef :: Sentence
+capRef, ldfRef, nonFLRef, probBRRef, riskRef :: Sentence
 capRef      = definedIn' calofCapacity (S "and is also called capacity")
-jRef        = definedIn  strDisFac
-jtolRef     = definedIn  tolStrDisFac
 ldfRef      = definedIn  loadDFDD
 nonFLRef    = definedIn  nonFL
 probBRRef   = definedIn  probOfBreak
-qHtRef      = definedIn  dimLL
-qHtTlTolRef = definedIn  tolPre
 riskRef     = definedIn  risk
-
--- Helper --
-interpolating :: (HasUID s, HasSymbol s, Referable f, HasShortName f) => s -> f -> Sentence
-interpolating s f = foldlSent [ch s `S.is` S "obtained by interpolating from",
-  plural datum, S "shown" `S.in_` refS f]
diff --git a/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html b/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html
index 033a1e73cf4..a600eebca35 100644
--- a/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html
+++ b/code/stable/glassbr/SRS/HTML/GlassBR_SRS.html
@@ -236,16 +236,6 @@ <h2>Table of Symbols</h2>
                   <td>Minimum thickness</td>
                   <td><em>m</em></td>
                 </tr>
-                <tr>
-                  <td><em>interpY</em></td>
-                  <td>InterpY</td>
-                  <td>--</td>
-                </tr>
-                <tr>
-                  <td><em>interpZ</em></td>
-                  <td>InterpZ</td>
-                  <td>--</td>
-                </tr>
                 <tr>
                   <td><em>isSafeLoad</em></td>
                   <td>Load resistance safety requirement</td>
@@ -1237,9 +1227,7 @@ <h3>Data Definitions</h3>
                     </tr>
                     <tr>
                       <th>RefBy</th>
-                      <td>
-                        <p class="paragraph"><a href=#DD:calofDemand>DD:calofDemand</a></p>
-                      </td>
+                      <td><p class="paragraph"></p></td>
                     </tr>
                   </table>
                 </div>
@@ -1293,11 +1281,7 @@ <h3>Data Definitions</h3>
                     </tr>
                     <tr>
                       <th>RefBy</th>
-                      <td>
-                        <p class="paragraph">
-                          <a href=#IM:tolLoad>IM:tolLoad</a> and <a href=#IM:stressDistFac>IM:stressDistFac</a>
-                        </p>
-                      </td>
+                      <td><p class="paragraph"></p></td>
                     </tr>
                   </table>
                 </div>
@@ -1341,68 +1325,7 @@ <h3>Data Definitions</h3>
                     </tr>
                     <tr>
                       <th>RefBy</th>
-                      <td>
-                        <p class="paragraph"><a href=#DD:calofDemand>DD:calofDemand</a></p>
-                      </td>
-                    </tr>
-                  </table>
-                </div>
-                <div id="DD:calofDemand">
-                  <table class="ddefn">
-                    <tr>
-                      <th>Refname</th>
-                      <td><b>DD:calofDemand</b></td>
-                    </tr>
-                    <tr>
-                      <th>Label</th>
-                      <td><p class="paragraph">Applied load (demand)</p></td>
-                    </tr>
-                    <tr>
-                      <th>Symbol</th>
-                      <td><p class="paragraph"><em>q</em></p></td>
-                    </tr>
-                    <tr>
-                      <th>Units</th>
-                      <td><p class="paragraph"><em>Pa</em></p></td>
-                    </tr>
-                    <tr>
-                      <th>Equation</th>
-                      <td>
-                        \[q=\mathit{interpY}\left(\text{``TSD.txt''},\mathit{SD},{w_{\mathit{TNT}}}\right)\]
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>Description</th>
-                      <td>
-                        <ul class="hide-list-style-no-indent">
-                          <li><em>q</em> is the applied load (demand) (<em>Pa</em>)</li>
-                          <li><em>interpY</em> is the interpY (Unitless)</li>
-                          <li><em>SD</em> is the stand off distance (<em>m</em>)</li>
-                          <li>
-                            <em>w<sub>TNT</sub></em> is the equivalent TNT charge mass (<em>kg</em>)
-                          </li>
-                        </ul>
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>Notes</th>
-                      <td>
-                        <p class="paragraph">
-                          <em>q</em>, or applied load (demand), is the 3 second duration equivalent pressure obtained from <a href=#Figure:demandVSsod>Fig:demandVSsod</a> by interpolation using stand off distance (<em>SD</em>) and <em>w<sub>TNT</sub></em> as parameters. <em>w<sub>TNT</sub></em> is defined in <a href=#DD:eqTNTW>DD:eqTNTW</a>. <em>SD</em> is the stand off distance as defined in <a href=#DD:standOffDist>DD:standOffDist</a>.
-                        </p>
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>Source</th>
-                      <td><p class="paragraph"><a href=#astm2009>astm2009</a></p></td>
-                    </tr>
-                    <tr>
-                      <th>RefBy</th>
-                      <td>
-                        <p class="paragraph">
-                          <a href=#IM:isSafeLR>IM:isSafeLR</a> and <a href=#IM:dimlessLoad>IM:dimlessLoad</a>
-                        </p>
-                      </td>
+                      <td><p class="paragraph"></p></td>
                     </tr>
                   </table>
                 </div>
@@ -1496,9 +1419,6 @@ <h3>Instance Models</h3>
                         <p class="paragraph">
                           <em>LDF</em> is defined in <a href=#DD:loadDurFactor>DD:loadDurFactor</a>.
                         </p>
-                        <p class="paragraph">
-                          <em>J</em> is defined in <a href=#IM:stressDistFac>IM:stressDistFac</a>.
-                        </p>
                       </td>
                     </tr>
                     <tr>
@@ -1517,79 +1437,6 @@ <h3>Instance Models</h3>
                     </tr>
                   </table>
                 </div>
-                <div id="IM:stressDistFac">
-                  <table class="idefn">
-                    <tr>
-                      <th>Refname</th>
-                      <td><b>IM:stressDistFac</b></td>
-                    </tr>
-                    <tr>
-                      <th>Label</th>
-                      <td>
-                        <p class="paragraph">Stress distribution factor (Function)</p>
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>Input</th>
-                      <td><p class="paragraph"><em>AR</em>, <em>q&#770;</em></p></td>
-                    </tr>
-                    <tr>
-                      <th>Output</th>
-                      <td><p class="paragraph"><em>J</em></p></td>
-                    </tr>
-                    <tr>
-                      <th>Input Constraints</th>
-                      <td>\[\mathit{AR}\geq{}1\]</td>
-                    </tr>
-                    <tr>
-                      <th>Output Constraints</th>
-                      <td>\[{J_{\text{min}}}\leq{}J\leq{}{J_{\text{max}}}\]</td>
-                    </tr>
-                    <tr>
-                      <th>Equation</th>
-                      <td>
-                        \[J=\mathit{interpZ}\left(\text{``SDF.txt''},\mathit{AR},\hat{q}\right)\]
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>Description</th>
-                      <td>
-                        <ul class="hide-list-style-no-indent">
-                          <li>
-                            <em>J</em> is the stress distribution factor (Function) (Unitless)
-                          </li>
-                          <li><em>interpZ</em> is the interpZ (Unitless)</li>
-                          <li><em>AR</em> is the aspect ratio (Unitless)</li>
-                          <li><em>q&#770;</em> is the dimensionless load (Unitless)</li>
-                        </ul>
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>Notes</th>
-                      <td>
-                        <p class="paragraph">
-                          <em>J</em> is obtained by interpolating from data shown in <a href=#Figure:dimlessloadVSaspect>Fig:dimlessloadVSaspect</a>.
-                        </p>
-                        <p class="paragraph">
-                          <em>AR</em> is defined in <a href=#DD:aspectRatio>DD:aspectRatio</a>.
-                        </p>
-                        <p class="paragraph">
-                          <em>q&#770;</em> is defined in <a href=#IM:dimlessLoad>IM:dimlessLoad</a>.
-                        </p>
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>Source</th>
-                      <td><p class="paragraph"><a href=#astm2009>astm2009</a></p></td>
-                    </tr>
-                    <tr>
-                      <th>RefBy</th>
-                      <td>
-                        <p class="paragraph"><a href=#IM:riskFun>IM:riskFun</a></p>
-                      </td>
-                    </tr>
-                  </table>
-                </div>
                 <div id="IM:nFL">
                   <table class="idefn">
                     <tr>
@@ -1653,9 +1500,6 @@ <h3>Instance Models</h3>
                     <tr>
                       <th>Notes</th>
                       <td>
-                        <p class="paragraph">
-                          <em>q&#770;<sub>tol</sub></em> is defined in <a href=#IM:tolLoad>IM:tolLoad</a>.
-                        </p>
                         <p class="paragraph">
                           <em>E</em> comes from <a href=#assumpSV>A:standardValues</a>.
                         </p>
@@ -1743,9 +1587,6 @@ <h3>Instance Models</h3>
                     <tr>
                       <th>Notes</th>
                       <td>
-                        <p class="paragraph">
-                          <em>q</em> is the 3 second duration equivalent pressure, as given in <a href=#DD:calofDemand>DD:calofDemand</a>.
-                        </p>
                         <p class="paragraph">
                           <em>a</em> and <em>b</em> are the dimensions of the plate, where (<em>a&thinsp;&ge;&thinsp;b</em>).
                         </p>
@@ -1770,84 +1611,7 @@ <h3>Instance Models</h3>
                     </tr>
                     <tr>
                       <th>RefBy</th>
-                      <td>
-                        <p class="paragraph">
-                          <a href=#IM:stressDistFac>IM:stressDistFac</a>
-                        </p>
-                      </td>
-                    </tr>
-                  </table>
-                </div>
-                <div id="IM:tolLoad">
-                  <table class="idefn">
-                    <tr>
-                      <th>Refname</th>
-                      <td><b>IM:tolLoad</b></td>
-                    </tr>
-                    <tr>
-                      <th>Label</th>
-                      <td><p class="paragraph">Tolerable load</p></td>
-                    </tr>
-                    <tr>
-                      <th>Input</th>
-                      <td>
-                        <p class="paragraph"><em>AR</em>, <em>J<sub>tol</sub></em></p>
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>Output</th>
-                      <td><p class="paragraph"><em>q&#770;<sub>tol</sub></em></p></td>
-                    </tr>
-                    <tr>
-                      <th>Input Constraints</th>
-                      <td>\[\mathit{AR}\geq{}1\]</td>
-                    </tr>
-                    <tr>
-                      <th>Output Constraints</th>
-                      <td></td>
-                    </tr>
-                    <tr>
-                      <th>Equation</th>
-                      <td>
-                        \[{\hat{q}_{\text{tol}}}=\mathit{interpY}\left(\text{``SDF.txt''},\mathit{AR},{J_{\text{tol}}}\right)\]
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>Description</th>
-                      <td>
-                        <ul class="hide-list-style-no-indent">
-                          <li>
-                            <em>q&#770;<sub>tol</sub></em> is the tolerable load (Unitless)
-                          </li>
-                          <li><em>interpY</em> is the interpY (Unitless)</li>
-                          <li><em>AR</em> is the aspect ratio (Unitless)</li>
-                          <li>
-                            <em>J<sub>tol</sub></em> is the tolerable stress distribution factor (Unitless)
-                          </li>
-                        </ul>
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>Notes</th>
-                      <td>
-                        <p class="paragraph">
-                          <em>q&#770;<sub>tol</sub></em> is obtained by interpolating from data shown in <a href=#Figure:dimlessloadVSaspect>Fig:dimlessloadVSaspect</a>.
-                        </p>
-                        <p class="paragraph">
-                          <em>AR</em> is defined in <a href=#DD:aspectRatio>DD:aspectRatio</a>.
-                        </p>
-                        <p class="paragraph">
-                          <em>J<sub>tol</sub></em> is defined in <a href=#IM:sdfTol>IM:sdfTol</a>.
-                        </p>
-                      </td>
-                    </tr>
-                    <tr>
-                      <th>Source</th>
-                      <td><p class="paragraph"><a href=#astm2009>astm2009</a></p></td>
-                    </tr>
-                    <tr>
-                      <th>RefBy</th>
-                      <td><p class="paragraph"><a href=#IM:nFL>IM:nFL</a></p></td>
+                      <td><p class="paragraph"></p></td>
                     </tr>
                   </table>
                 </div>
@@ -1949,9 +1713,7 @@ <h3>Instance Models</h3>
                     </tr>
                     <tr>
                       <th>RefBy</th>
-                      <td>
-                        <p class="paragraph"><a href=#IM:tolLoad>IM:tolLoad</a></p>
-                      </td>
+                      <td><p class="paragraph"></p></td>
                     </tr>
                   </table>
                 </div>
@@ -2224,9 +1986,6 @@ <h3>Instance Models</h3>
                         <p class="paragraph">
                           <em>LR</em> is defined in <a href=#IM:calofCapacity>IM:calofCapacity</a> and is also called capacity.
                         </p>
-                        <p class="paragraph">
-                          <em>q</em> is the 3 second duration equivalent pressure, as given in <a href=#DD:calofDemand>DD:calofDemand</a>.
-                        </p>
                       </td>
                     </tr>
                     <tr>
@@ -2578,12 +2337,6 @@ <h2>Functional Requirements</h2>
                   <td><a href=#IM:isSafePb>IM:isSafePb</a></td>
                   <td>--</td>
                 </tr>
-                <tr>
-                  <td><em>J</em></td>
-                  <td>Stress distribution factor (Function)</td>
-                  <td><a href=#IM:stressDistFac>IM:stressDistFac</a></td>
-                  <td>--</td>
-                </tr>
                 <tr>
                   <td><em>J<sub>tol</sub></em></td>
                   <td>Tolerable stress distribution factor</td>
@@ -2614,12 +2367,6 @@ <h2>Functional Requirements</h2>
                   <td><a href=#IM:dimlessLoad>IM:dimlessLoad</a></td>
                   <td>--</td>
                 </tr>
-                <tr>
-                  <td><em>q&#770;<sub>tol</sub></em></td>
-                  <td>Tolerable load</td>
-                  <td><a href=#IM:tolLoad>IM:tolLoad</a></td>
-                  <td>--</td>
-                </tr>
               </table>
               <p class="caption">Required Outputs</p>
             </div>
@@ -2911,17 +2658,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
             </tr>
-            <tr>
-              <td><a href=#DD:calofDemand>DD:calofDemand</a></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
             <tr>
               <td><a href=#TM:isSafeProb>TM:isSafeProb</a></td>
               <td></td>
@@ -2955,17 +2691,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
             </tr>
-            <tr>
-              <td><a href=#IM:stressDistFac>IM:stressDistFac</a></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
             <tr>
               <td><a href=#IM:nFL>IM:nFL</a></td>
               <td></td>
@@ -2988,17 +2713,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
             </tr>
-            <tr>
-              <td><a href=#IM:tolLoad>IM:tolLoad</a></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
             <tr>
               <td><a href=#IM:sdfTol>IM:sdfTol</a></td>
               <td></td>
@@ -3294,14 +3008,11 @@ <h1>Traceability Matrices and Graphs</h1>
               <th><a href=#DD:standOffDist>DD:standOffDist</a></th>
               <th><a href=#DD:aspectRatio>DD:aspectRatio</a></th>
               <th><a href=#DD:eqTNTW>DD:eqTNTW</a></th>
-              <th><a href=#DD:calofDemand>DD:calofDemand</a></th>
               <th><a href=#TM:isSafeProb>TM:isSafeProb</a></th>
               <th><a href=#TM:isSafeLoad>TM:isSafeLoad</a></th>
               <th><a href=#IM:riskFun>IM:riskFun</a></th>
-              <th><a href=#IM:stressDistFac>IM:stressDistFac</a></th>
               <th><a href=#IM:nFL>IM:nFL</a></th>
               <th><a href=#IM:dimlessLoad>IM:dimlessLoad</a></th>
-              <th><a href=#IM:tolLoad>IM:tolLoad</a></th>
               <th><a href=#IM:sdfTol>IM:sdfTol</a></th>
               <th><a href=#IM:probOfBreak>IM:probOfBreak</a></th>
               <th><a href=#IM:calofCapacity>IM:calofCapacity</a></th>
@@ -3326,9 +3037,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#DD:loadDurFactor>DD:loadDurFactor</a></td>
@@ -3348,9 +3056,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#DD:gTF>DD:gTF</a></td>
@@ -3370,9 +3075,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#DD:standOffDist>DD:standOffDist</a></td>
@@ -3392,9 +3094,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#DD:aspectRatio>DD:aspectRatio</a></td>
@@ -3414,9 +3113,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#DD:eqTNTW>DD:eqTNTW</a></td>
@@ -3436,31 +3132,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td><a href=#DD:calofDemand>DD:calofDemand</a></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td>X</td>
-              <td></td>
-              <td>X</td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#TM:isSafeProb>TM:isSafeProb</a></td>
@@ -3480,9 +3151,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#TM:isSafeLoad>TM:isSafeLoad</a></td>
@@ -3502,9 +3170,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#IM:riskFun>IM:riskFun</a></td>
@@ -3518,31 +3183,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td>X</td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td><a href=#IM:stressDistFac>IM:stressDistFac</a></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td>X</td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td>X</td>
               <td></td>
               <td></td>
               <td></td>
@@ -3565,9 +3205,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td>X</td>
-              <td></td>
-              <td></td>
               <td></td>
               <td></td>
               <td></td>
@@ -3580,9 +3217,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td>X</td>
-              <td></td>
-              <td></td>
               <td></td>
               <td></td>
               <td></td>
@@ -3594,28 +3228,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
             </tr>
-            <tr>
-              <td><a href=#IM:tolLoad>IM:tolLoad</a></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td>X</td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td>X</td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
             <tr>
               <td><a href=#IM:sdfTol>IM:sdfTol</a></td>
               <td>X</td>
@@ -3634,9 +3246,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#IM:probOfBreak>IM:probOfBreak</a></td>
@@ -3648,7 +3257,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
               <td>X</td>
               <td></td>
               <td></td>
@@ -3657,8 +3265,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#IM:calofCapacity>IM:calofCapacity</a></td>
@@ -3671,8 +3277,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
               <td>X</td>
               <td></td>
               <td></td>
@@ -3680,7 +3284,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#IM:isSafePb>IM:isSafePb</a></td>
@@ -3696,9 +3299,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
               <td>X</td>
               <td></td>
               <td></td>
@@ -3712,9 +3312,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td>X</td>
-              <td></td>
-              <td></td>
               <td></td>
               <td></td>
               <td></td>
@@ -3741,14 +3338,11 @@ <h1>Traceability Matrices and Graphs</h1>
               <th><a href=#DD:standOffDist>DD:standOffDist</a></th>
               <th><a href=#DD:aspectRatio>DD:aspectRatio</a></th>
               <th><a href=#DD:eqTNTW>DD:eqTNTW</a></th>
-              <th><a href=#DD:calofDemand>DD:calofDemand</a></th>
               <th><a href=#TM:isSafeProb>TM:isSafeProb</a></th>
               <th><a href=#TM:isSafeLoad>TM:isSafeLoad</a></th>
               <th><a href=#IM:riskFun>IM:riskFun</a></th>
-              <th><a href=#IM:stressDistFac>IM:stressDistFac</a></th>
               <th><a href=#IM:nFL>IM:nFL</a></th>
               <th><a href=#IM:dimlessLoad>IM:dimlessLoad</a></th>
-              <th><a href=#IM:tolLoad>IM:tolLoad</a></th>
               <th><a href=#IM:sdfTol>IM:sdfTol</a></th>
               <th><a href=#IM:probOfBreak>IM:probOfBreak</a></th>
               <th><a href=#IM:calofCapacity>IM:calofCapacity</a></th>
@@ -3805,9 +3399,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#inputValues>FR:Input-Values</a></td>
@@ -3839,9 +3430,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td>
@@ -3875,9 +3463,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td>
@@ -3911,9 +3496,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td>
@@ -3935,9 +3517,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
               <td>X</td>
               <td>X</td>
               <td></td>
@@ -3967,9 +3546,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
               <td>X</td>
               <td>X</td>
               <td></td>
@@ -4015,9 +3591,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#correct>NFR:Correctness</a></td>
@@ -4049,9 +3622,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#verifiable>NFR:Verifiability</a></td>
@@ -4083,9 +3653,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#understandable>NFR:Understandability</a></td>
@@ -4117,9 +3684,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#reusable>NFR:Reusability</a></td>
@@ -4151,9 +3715,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#maintainable>NFR:Maintainability</a></td>
@@ -4185,9 +3746,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
             <tr>
               <td><a href=#portable>NFR:Portablity</a></td>
@@ -4219,9 +3777,6 @@ <h1>Traceability Matrices and Graphs</h1>
               <td></td>
               <td></td>
               <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
             </tr>
           </table>
           <p class="caption">
diff --git a/code/stable/glassbr/SRS/Jupyter/GlassBR_SRS.ipynb b/code/stable/glassbr/SRS/Jupyter/GlassBR_SRS.ipynb
index 887e53b7f21..e8af32e2b8b 100644
--- a/code/stable/glassbr/SRS/Jupyter/GlassBR_SRS.ipynb
+++ b/code/stable/glassbr/SRS/Jupyter/GlassBR_SRS.ipynb
@@ -102,8 +102,6 @@
     "|$g$|Glass type|--|\n",
     "|$GTF$|Glass type factor|--|\n",
     "|$h$|Minimum thickness|$m$|\n",
-    "|$interpY$|InterpY|--|\n",
-    "|$interpZ$|InterpZ|--|\n",
     "|$isSafeLoad$|Load resistance safety requirement|--|\n",
     "|$isSafeLR$|3 second load equivalent resistance safety requirement|--|\n",
     "|$isSafePb$|Probability of glass breakage safety requirement|--|\n",
@@ -747,7 +745,7 @@
     "<th>RefBy</th>\n",
     "<td>\n",
     "\n",
-    "[DD:calofDemand](#DD:calofDemand)\n",
+    "\n",
     "</td>\n",
     "</tr>\n",
     "</table>\n",
@@ -814,7 +812,7 @@
     "<th>RefBy</th>\n",
     "<td>\n",
     "\n",
-    "[IM:tolLoad](#IM:tolLoad) and [IM:stressDistFac](#IM:stressDistFac)\n",
+    "\n",
     "</td>\n",
     "</tr>\n",
     "</table>\n",
@@ -874,75 +872,7 @@
     "<th>RefBy</th>\n",
     "<td>\n",
     "\n",
-    "[DD:calofDemand](#DD:calofDemand)\n",
-    "</td>\n",
-    "</tr>\n",
-    "</table>\n",
-    "<br>\n",
-    "<a id=\"DD:calofDemand\"></a>\n",
-    "<table class=\\\"ddefn\\\">\n",
-    "<tr>\n",
-    "<th>Refname</th>\n",
-    "<td>\n",
-    "<b>DD:calofDemand</b>\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Label</th>\n",
-    "<td>\n",
-    "\n",
-    "Applied load (demand)\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Symbol</th>\n",
-    "<td>\n",
-    "\n",
-    "$q$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Units</th>\n",
-    "<td>\n",
-    "\n",
-    "$Pa$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Equation</th>\n",
-    "<td>\n",
-    "$$q=\\mathit{interpY}\\left(\\text{``TSD.txt''},\\mathit{SD},{w_{\\mathit{TNT}}}\\right)$$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Description</th>\n",
-    "<td>\n",
-    "\n",
-    "<li>$q$ is the applied load (demand) ($Pa$)</li>\n",
-    "<li>$interpY$ is the interpY (Unitless)</li>\n",
-    "<li>$SD$ is the stand off distance ($m$)</li>\n",
-    "<li>$w_TNT$ is the equivalent TNT charge mass ($kg$)</li>\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Notes</th>\n",
-    "<td>\n",
     "\n",
-    "$q$, or applied load (demand), is the 3 second duration equivalent pressure obtained from [Fig:demandVSsod](#Figure:demandVSsod) by interpolation using stand off distance ($SD$) and $w_TNT$ as parameters. $w_TNT$ is defined in [DD:eqTNTW](#DD:eqTNTW). $SD$ is the stand off distance as defined in [DD:standOffDist](#DD:standOffDist).\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Source</th>\n",
-    "<td>\n",
-    "\n",
-    "<a href=#astm2009>astm2009</a> \n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>RefBy</th>\n",
-    "<td>\n",
-    "\n",
-    "[IM:isSafeLR](#IM:isSafeLR) and [IM:dimlessLoad](#IM:dimlessLoad)\n",
     "</td>\n",
     "</tr>\n",
     "</table>\n",
@@ -1025,8 +955,6 @@
     "$h$ is defined in [DD:minThick](#DD:minThick) and is based on the nominal thicknesses.\n",
     "\n",
     "$LDF$ is defined in [DD:loadDurFactor](#DD:loadDurFactor).\n",
-    "\n",
-    "$J$ is defined in [IM:stressDistFac](#IM:stressDistFac).\n",
     "</td>\n",
     "</tr>\n",
     "<tr>\n",
@@ -1045,90 +973,6 @@
     "</tr>\n",
     "</table>\n",
     "<br>\n",
-    "<a id=\"IM:stressDistFac\"></a>\n",
-    "<table class=\\\"idefn\\\">\n",
-    "<tr>\n",
-    "<th>Refname</th>\n",
-    "<td>\n",
-    "<b>IM:stressDistFac</b>\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Label</th>\n",
-    "<td>\n",
-    "\n",
-    "Stress distribution factor (Function)\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Input</th>\n",
-    "<td>\n",
-    "\n",
-    "$AR$, $q&#770;$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Output</th>\n",
-    "<td>\n",
-    "\n",
-    "$J$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Input Constraints</th>\n",
-    "<td>\n",
-    "$$\\mathit{AR}\\geq{}1$$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Output Constraints</th>\n",
-    "<td>\n",
-    "$${J_{\\text{min}}}\\leq{}J\\leq{}{J_{\\text{max}}}$$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Equation</th>\n",
-    "<td>\n",
-    "$$J=\\mathit{interpZ}\\left(\\text{``SDF.txt''},\\mathit{AR},\\hat{q}\\right)$$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Description</th>\n",
-    "<td>\n",
-    "\n",
-    "<li>$J$ is the stress distribution factor (Function) (Unitless)</li>\n",
-    "<li>$interpZ$ is the interpZ (Unitless)</li>\n",
-    "<li>$AR$ is the aspect ratio (Unitless)</li>\n",
-    "<li>$q&#770;$ is the dimensionless load (Unitless)</li>\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Notes</th>\n",
-    "<td>\n",
-    "\n",
-    "$J$ is obtained by interpolating from data shown in [Fig:dimlessloadVSaspect](#Figure:dimlessloadVSaspect).\n",
-    "\n",
-    "$AR$ is defined in [DD:aspectRatio](#DD:aspectRatio).\n",
-    "\n",
-    "$q&#770;$ is defined in [IM:dimlessLoad](#IM:dimlessLoad).\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Source</th>\n",
-    "<td>\n",
-    "\n",
-    "<a href=#astm2009>astm2009</a> \n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>RefBy</th>\n",
-    "<td>\n",
-    "\n",
-    "[IM:riskFun](#IM:riskFun)\n",
-    "</td>\n",
-    "</tr>\n",
-    "</table>\n",
-    "<br>\n",
     "<a id=\"IM:nFL\"></a>\n",
     "<table class=\\\"idefn\\\">\n",
     "<tr>\n",
@@ -1192,8 +1036,6 @@
     "<th>Notes</th>\n",
     "<td>\n",
     "\n",
-    "$q&#770;_tol$ is defined in [IM:tolLoad](#IM:tolLoad).\n",
-    "\n",
     "$E$ comes from [A:standardValues](#assumpSV).\n",
     "\n",
     "$h$ is defined in [DD:minThick](#DD:minThick) and is based on the nominal thicknesses.\n",
@@ -1281,8 +1123,6 @@
     "<th>Notes</th>\n",
     "<td>\n",
     "\n",
-    "$q$ is the 3 second duration equivalent pressure, as given in [DD:calofDemand](#DD:calofDemand).\n",
-    "\n",
     "$a$ and $b$ are the dimensions of the plate, where ($a&thinsp;&ge;&thinsp;b$).\n",
     "\n",
     "$E$ comes from [A:standardValues](#assumpSV).\n",
@@ -1303,90 +1143,7 @@
     "<th>RefBy</th>\n",
     "<td>\n",
     "\n",
-    "[IM:stressDistFac](#IM:stressDistFac)\n",
-    "</td>\n",
-    "</tr>\n",
-    "</table>\n",
-    "<br>\n",
-    "<a id=\"IM:tolLoad\"></a>\n",
-    "<table class=\\\"idefn\\\">\n",
-    "<tr>\n",
-    "<th>Refname</th>\n",
-    "<td>\n",
-    "<b>IM:tolLoad</b>\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Label</th>\n",
-    "<td>\n",
-    "\n",
-    "Tolerable load\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Input</th>\n",
-    "<td>\n",
     "\n",
-    "$AR$, $J_tol$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Output</th>\n",
-    "<td>\n",
-    "\n",
-    "$q&#770;_tol$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Input Constraints</th>\n",
-    "<td>\n",
-    "$$\\mathit{AR}\\geq{}1$$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Output Constraints</th>\n",
-    "<td>\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Equation</th>\n",
-    "<td>\n",
-    "$${\\hat{q}_{\\text{tol}}}=\\mathit{interpY}\\left(\\text{``SDF.txt''},\\mathit{AR},{J_{\\text{tol}}}\\right)$$\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Description</th>\n",
-    "<td>\n",
-    "\n",
-    "<li>$q&#770;_tol$ is the tolerable load (Unitless)</li>\n",
-    "<li>$interpY$ is the interpY (Unitless)</li>\n",
-    "<li>$AR$ is the aspect ratio (Unitless)</li>\n",
-    "<li>$J_tol$ is the tolerable stress distribution factor (Unitless)</li>\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Notes</th>\n",
-    "<td>\n",
-    "\n",
-    "$q&#770;_tol$ is obtained by interpolating from data shown in [Fig:dimlessloadVSaspect](#Figure:dimlessloadVSaspect).\n",
-    "\n",
-    "$AR$ is defined in [DD:aspectRatio](#DD:aspectRatio).\n",
-    "\n",
-    "$J_tol$ is defined in [IM:sdfTol](#IM:sdfTol).\n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>Source</th>\n",
-    "<td>\n",
-    "\n",
-    "<a href=#astm2009>astm2009</a> \n",
-    "</td>\n",
-    "</tr>\n",
-    "<tr>\n",
-    "<th>RefBy</th>\n",
-    "<td>\n",
-    "\n",
-    "[IM:nFL](#IM:nFL)\n",
     "</td>\n",
     "</tr>\n",
     "</table>\n",
@@ -1480,7 +1237,7 @@
     "<th>RefBy</th>\n",
     "<td>\n",
     "\n",
-    "[IM:tolLoad](#IM:tolLoad)\n",
+    "\n",
     "</td>\n",
     "</tr>\n",
     "</table>\n",
@@ -1790,8 +1547,6 @@
     "If $isSafeLR$, the glass is considered safe. $isSafePb$ (from [IM:isSafePb](#IM:isSafePb)) and $isSafeLR$ are either both True or both False.\n",
     "\n",
     "$LR$ is defined in [IM:calofCapacity](#IM:calofCapacity) and is also called capacity.\n",
-    "\n",
-    "$q$ is the 3 second duration equivalent pressure, as given in [DD:calofDemand](#DD:calofDemand).\n",
     "</td>\n",
     "</tr>\n",
     "<tr>\n",
@@ -1918,13 +1673,11 @@
     "|$h$|Minimum thickness|[DD:minThick](#DD:minThick)|$m$|\n",
     "|$isSafeLR$|3 second load equivalent resistance safety requirement|[IM:isSafeLR](#IM:isSafeLR)|--|\n",
     "|$isSafePb$|Probability of glass breakage safety requirement|[IM:isSafePb](#IM:isSafePb)|--|\n",
-    "|$J$|Stress distribution factor (Function)|[IM:stressDistFac](#IM:stressDistFac)|--|\n",
     "|$J_tol$|Tolerable stress distribution factor|[IM:sdfTol](#IM:sdfTol)|--|\n",
     "|$LR$|Load resistance|[IM:calofCapacity](#IM:calofCapacity)|$Pa$|\n",
     "|$NFL$|Non-factored load|[IM:nFL](#IM:nFL)|$Pa$|\n",
     "|$P_b$|Probability of breakage|[IM:probOfBreak](#IM:probOfBreak)|--|\n",
     "|$q&#770;$|Dimensionless load|[IM:dimlessLoad](#IM:dimlessLoad)|--|\n",
-    "|$q&#770;_tol$|Tolerable load|[IM:tolLoad](#IM:tolLoad)|--|\n",
     "\n",
     "\n",
     "## Non-Functional Requirements\n",
@@ -2026,14 +1779,11 @@
     "|[DD:standOffDist](#DD:standOffDist)|||||||||\n",
     "|[DD:aspectRatio](#DD:aspectRatio)|||||||||\n",
     "|[DD:eqTNTW](#DD:eqTNTW)|||||||||\n",
-    "|[DD:calofDemand](#DD:calofDemand)|||||||||\n",
     "|[TM:isSafeProb](#TM:isSafeProb)|||||||||\n",
     "|[TM:isSafeLoad](#TM:isSafeLoad)|||||||||\n",
     "|[IM:riskFun](#IM:riskFun)|||||||||\n",
-    "|[IM:stressDistFac](#IM:stressDistFac)|||||||||\n",
     "|[IM:nFL](#IM:nFL)||||X|||||\n",
     "|[IM:dimlessLoad](#IM:dimlessLoad)||||X|||||\n",
-    "|[IM:tolLoad](#IM:tolLoad)|||||||||\n",
     "|[IM:sdfTol](#IM:sdfTol)||||X|||||\n",
     "|[IM:probOfBreak](#IM:probOfBreak)|||||||||\n",
     "|[IM:calofCapacity](#IM:calofCapacity)|||||||||\n",
@@ -2062,46 +1812,43 @@
     "\n",
     "<a id=\"Table:TraceMatRefvsRef\"></a>\n",
     "\n",
-    "||[DD:minThick](#DD:minThick)|[DD:loadDurFactor](#DD:loadDurFactor)|[DD:gTF](#DD:gTF)|[DD:standOffDist](#DD:standOffDist)|[DD:aspectRatio](#DD:aspectRatio)|[DD:eqTNTW](#DD:eqTNTW)|[DD:calofDemand](#DD:calofDemand)|[TM:isSafeProb](#TM:isSafeProb)|[TM:isSafeLoad](#TM:isSafeLoad)|[IM:riskFun](#IM:riskFun)|[IM:stressDistFac](#IM:stressDistFac)|[IM:nFL](#IM:nFL)|[IM:dimlessLoad](#IM:dimlessLoad)|[IM:tolLoad](#IM:tolLoad)|[IM:sdfTol](#IM:sdfTol)|[IM:probOfBreak](#IM:probOfBreak)|[IM:calofCapacity](#IM:calofCapacity)|[IM:isSafePb](#IM:isSafePb)|[IM:isSafeLR](#IM:isSafeLR)|\n",
-    "|:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |\n",
-    "|[DD:minThick](#DD:minThick)||||||||||||||||||||\n",
-    "|[DD:loadDurFactor](#DD:loadDurFactor)||||||||||||||||||||\n",
-    "|[DD:gTF](#DD:gTF)||||||||||||||||||||\n",
-    "|[DD:standOffDist](#DD:standOffDist)||||||||||||||||||||\n",
-    "|[DD:aspectRatio](#DD:aspectRatio)||||||||||||||||||||\n",
-    "|[DD:eqTNTW](#DD:eqTNTW)||||||||||||||||||||\n",
-    "|[DD:calofDemand](#DD:calofDemand)||||X||X||||||||||||||\n",
-    "|[TM:isSafeProb](#TM:isSafeProb)||||||||||||||||||||\n",
-    "|[TM:isSafeLoad](#TM:isSafeLoad)||||||||||||||||||||\n",
-    "|[IM:riskFun](#IM:riskFun)|X|X|||||||||X|||||||||\n",
-    "|[IM:stressDistFac](#IM:stressDistFac)|||||X||||||||X|||||||\n",
-    "|[IM:nFL](#IM:nFL)|X|||||||||||||X||||||\n",
-    "|[IM:dimlessLoad](#IM:dimlessLoad)|X||X||||X|||||||||||||\n",
-    "|[IM:tolLoad](#IM:tolLoad)|||||X||||||||||X|||||\n",
-    "|[IM:sdfTol](#IM:sdfTol)|X|X||||||||||||||||||\n",
-    "|[IM:probOfBreak](#IM:probOfBreak)||||||||||X||||||||||\n",
-    "|[IM:calofCapacity](#IM:calofCapacity)|||X|||||||||X||||||||\n",
-    "|[IM:isSafePb](#IM:isSafePb)||||||||||||||||X|||X|\n",
-    "|[IM:isSafeLR](#IM:isSafeLR)|||||||X||||||||||X|X||\n",
+    "||[DD:minThick](#DD:minThick)|[DD:loadDurFactor](#DD:loadDurFactor)|[DD:gTF](#DD:gTF)|[DD:standOffDist](#DD:standOffDist)|[DD:aspectRatio](#DD:aspectRatio)|[DD:eqTNTW](#DD:eqTNTW)|[TM:isSafeProb](#TM:isSafeProb)|[TM:isSafeLoad](#TM:isSafeLoad)|[IM:riskFun](#IM:riskFun)|[IM:nFL](#IM:nFL)|[IM:dimlessLoad](#IM:dimlessLoad)|[IM:sdfTol](#IM:sdfTol)|[IM:probOfBreak](#IM:probOfBreak)|[IM:calofCapacity](#IM:calofCapacity)|[IM:isSafePb](#IM:isSafePb)|[IM:isSafeLR](#IM:isSafeLR)|\n",
+    "|:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |\n",
+    "|[DD:minThick](#DD:minThick)|||||||||||||||||\n",
+    "|[DD:loadDurFactor](#DD:loadDurFactor)|||||||||||||||||\n",
+    "|[DD:gTF](#DD:gTF)|||||||||||||||||\n",
+    "|[DD:standOffDist](#DD:standOffDist)|||||||||||||||||\n",
+    "|[DD:aspectRatio](#DD:aspectRatio)|||||||||||||||||\n",
+    "|[DD:eqTNTW](#DD:eqTNTW)|||||||||||||||||\n",
+    "|[TM:isSafeProb](#TM:isSafeProb)|||||||||||||||||\n",
+    "|[TM:isSafeLoad](#TM:isSafeLoad)|||||||||||||||||\n",
+    "|[IM:riskFun](#IM:riskFun)|X|X|||||||||||||||\n",
+    "|[IM:nFL](#IM:nFL)|X||||||||||||||||\n",
+    "|[IM:dimlessLoad](#IM:dimlessLoad)|X||X||||||||||||||\n",
+    "|[IM:sdfTol](#IM:sdfTol)|X|X|||||||||||||||\n",
+    "|[IM:probOfBreak](#IM:probOfBreak)|||||||||X||||||||\n",
+    "|[IM:calofCapacity](#IM:calofCapacity)|||X|||||||X|||||||\n",
+    "|[IM:isSafePb](#IM:isSafePb)|||||||||||||X|||X|\n",
+    "|[IM:isSafeLR](#IM:isSafeLR)||||||||||||||X|X||\n",
     "\n",
     "\n",
     "<a id=\"Table:TraceMatAllvsR\"></a>\n",
     "\n",
-    "||[DD:minThick](#DD:minThick)|[DD:loadDurFactor](#DD:loadDurFactor)|[DD:gTF](#DD:gTF)|[DD:standOffDist](#DD:standOffDist)|[DD:aspectRatio](#DD:aspectRatio)|[DD:eqTNTW](#DD:eqTNTW)|[DD:calofDemand](#DD:calofDemand)|[TM:isSafeProb](#TM:isSafeProb)|[TM:isSafeLoad](#TM:isSafeLoad)|[IM:riskFun](#IM:riskFun)|[IM:stressDistFac](#IM:stressDistFac)|[IM:nFL](#IM:nFL)|[IM:dimlessLoad](#IM:dimlessLoad)|[IM:tolLoad](#IM:tolLoad)|[IM:sdfTol](#IM:sdfTol)|[IM:probOfBreak](#IM:probOfBreak)|[IM:calofCapacity](#IM:calofCapacity)|[IM:isSafePb](#IM:isSafePb)|[IM:isSafeLR](#IM:isSafeLR)|[FR:Input-Values](#inputValues)|[FR:System-Set-Values-Following-Assumptions](#sysSetValsFollowingAssumps)|[FR:Check-Input-with-Data_Constraints](#checkInputWithDataCons)|[FR:Output-Values-and-Known-Values](#outputValsAndKnownValues)|[FR:Check-Glass-Safety](#checkGlassSafety)|[FR:Output-Values](#outputValues)|[NFR:Correctness](#correct)|[NFR:Verifiability](#verifiable)|[NFR:Understandability](#understandable)|[NFR:Reusability](#reusable)|[NFR:Maintainability](#maintainable)|[NFR:Portablity](#portable)|\n",
-    "|:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |\n",
-    "|[GS:Predict-Glass-Withstands-Explosion](#willBreakGS)||||||||||||||||||||||||||||||||\n",
-    "|[FR:Input-Values](#inputValues)||||||||||||||||||||||||||||||||\n",
-    "|[FR:System-Set-Values-Following-Assumptions](#sysSetValsFollowingAssumps)||||||||||||||||||||||||||||||||\n",
-    "|[FR:Check-Input-with-Data_Constraints](#checkInputWithDataCons)||||||||||||||||||||||||||||||||\n",
-    "|[FR:Output-Values-and-Known-Values](#outputValsAndKnownValues)||||||||||||||||||||X|X|||||||||||\n",
-    "|[FR:Check-Glass-Safety](#checkGlassSafety)||||||||||||||||||X|X|||||||||||||\n",
-    "|[FR:Output-Values](#outputValues)||||||||||||||||||||||||||||||||\n",
-    "|[NFR:Correctness](#correct)||||||||||||||||||||||||||||||||\n",
-    "|[NFR:Verifiability](#verifiable)||||||||||||||||||||||||||||||||\n",
-    "|[NFR:Understandability](#understandable)||||||||||||||||||||||||||||||||\n",
-    "|[NFR:Reusability](#reusable)||||||||||||||||||||||||||||||||\n",
-    "|[NFR:Maintainability](#maintainable)||||||||||||||||||||||||||||||||\n",
-    "|[NFR:Portablity](#portable)||||||||||||||||||||||||||||||||\n",
+    "||[DD:minThick](#DD:minThick)|[DD:loadDurFactor](#DD:loadDurFactor)|[DD:gTF](#DD:gTF)|[DD:standOffDist](#DD:standOffDist)|[DD:aspectRatio](#DD:aspectRatio)|[DD:eqTNTW](#DD:eqTNTW)|[TM:isSafeProb](#TM:isSafeProb)|[TM:isSafeLoad](#TM:isSafeLoad)|[IM:riskFun](#IM:riskFun)|[IM:nFL](#IM:nFL)|[IM:dimlessLoad](#IM:dimlessLoad)|[IM:sdfTol](#IM:sdfTol)|[IM:probOfBreak](#IM:probOfBreak)|[IM:calofCapacity](#IM:calofCapacity)|[IM:isSafePb](#IM:isSafePb)|[IM:isSafeLR](#IM:isSafeLR)|[FR:Input-Values](#inputValues)|[FR:System-Set-Values-Following-Assumptions](#sysSetValsFollowingAssumps)|[FR:Check-Input-with-Data_Constraints](#checkInputWithDataCons)|[FR:Output-Values-and-Known-Values](#outputValsAndKnownValues)|[FR:Check-Glass-Safety](#checkGlassSafety)|[FR:Output-Values](#outputValues)|[NFR:Correctness](#correct)|[NFR:Verifiability](#verifiable)|[NFR:Understandability](#understandable)|[NFR:Reusability](#reusable)|[NFR:Maintainability](#maintainable)|[NFR:Portablity](#portable)|\n",
+    "|:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |:--- |\n",
+    "|[GS:Predict-Glass-Withstands-Explosion](#willBreakGS)|||||||||||||||||||||||||||||\n",
+    "|[FR:Input-Values](#inputValues)|||||||||||||||||||||||||||||\n",
+    "|[FR:System-Set-Values-Following-Assumptions](#sysSetValsFollowingAssumps)|||||||||||||||||||||||||||||\n",
+    "|[FR:Check-Input-with-Data_Constraints](#checkInputWithDataCons)|||||||||||||||||||||||||||||\n",
+    "|[FR:Output-Values-and-Known-Values](#outputValsAndKnownValues)|||||||||||||||||X|X|||||||||||\n",
+    "|[FR:Check-Glass-Safety](#checkGlassSafety)|||||||||||||||X|X|||||||||||||\n",
+    "|[FR:Output-Values](#outputValues)|||||||||||||||||||||||||||||\n",
+    "|[NFR:Correctness](#correct)|||||||||||||||||||||||||||||\n",
+    "|[NFR:Verifiability](#verifiable)|||||||||||||||||||||||||||||\n",
+    "|[NFR:Understandability](#understandable)|||||||||||||||||||||||||||||\n",
+    "|[NFR:Reusability](#reusable)|||||||||||||||||||||||||||||\n",
+    "|[NFR:Maintainability](#maintainable)|||||||||||||||||||||||||||||\n",
+    "|[NFR:Portablity](#portable)|||||||||||||||||||||||||||||\n",
     "\n",
     "\n",
     "The purpose of the traceability graphs is also to provide easy references on what has to be additionally modified if a certain component is changed. The arrows in the graphs represent dependencies. The component at the tail of an arrow is depended on by the component at the head of that arrow. Therefore, if a component is changed, the components that it points to should also be changed. [Fig:TraceGraphAvsA](#Figure:TraceGraphAvsA) shows the dependencies of assumptions on each other. [Fig:TraceGraphAvsAll](#Figure:TraceGraphAvsAll) shows the dependencies of data definitions, theoretical models, general definitions, instance models, requirements, likely changes, and unlikely changes on the assumptions. [Fig:TraceGraphRefvsRef](#Figure:TraceGraphRefvsRef) shows the dependencies of data definitions, theoretical models, general definitions, and instance models on each other. [Fig:TraceGraphAllvsR](#Figure:TraceGraphAllvsR) shows the dependencies of requirements and goal statements on the data definitions, theoretical models, general definitions, and instance models. [Fig:TraceGraphAllvsAll](#Figure:TraceGraphAllvsAll) shows the dependencies of dependencies of assumptions, models, definitions, requirements, goals, and changes with each other.\n",
diff --git a/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex b/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex
index 27894d93a32..c4e67263138 100644
--- a/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex
+++ b/code/stable/glassbr/SRS/PDF/GlassBR_SRS.tex
@@ -91,10 +91,6 @@ \subsection{Table of Symbols}
 \\
 $h$ & Minimum thickness & ${\text{m}}$
 \\
-$\mathit{interpY}$ & InterpY & --
-\\
-$\mathit{interpZ}$ & InterpZ & --
-\\
 $\mathit{isSafeLoad}$ & Load resistance safety requirement & --
 \\
 $\mathit{isSafeLR}$ & 3 second load equivalent resistance safety requirement & --
@@ -631,8 +627,7 @@ \subsubsection{Data Definitions}
 Source & \cite{astm2009}
          
 \\ \midrule
-RefBy & \hyperref[DD:calofDemand]{DD:calofDemand}
-        
+RefBy & 
 \\ \bottomrule
 \end{tabular}
 \end{minipage}
@@ -670,8 +665,7 @@ \subsubsection{Data Definitions}
 Source & \cite{astm2009}
          
 \\ \midrule
-RefBy & \hyperref[IM:tolLoad]{IM:tolLoad} and \hyperref[IM:stressDistFac]{IM:stressDistFac}
-        
+RefBy & 
 \\ \bottomrule
 \end{tabular}
 \end{minipage}
@@ -706,48 +700,7 @@ \subsubsection{Data Definitions}
 Source & \cite{astm2009}
          
 \\ \midrule
-RefBy & \hyperref[DD:calofDemand]{DD:calofDemand}
-        
-\\ \bottomrule
-\end{tabular}
-\end{minipage}
-
-\medskip
-\noindent
-\begin{minipage}{\textwidth}
-\begin{tabular}{>{\raggedright}p{0.13\textwidth}>{\raggedright\arraybackslash}p{0.82\textwidth}}
-\toprule \textbf{Refname} & \textbf{DD:calofDemand}
-\phantomsection 
-\label{DD:calofDemand}
-\\ \midrule
-Label & Applied load (demand)
-        
-\\ \midrule
-Symbol & $q$
-         
-\\ \midrule
-Units & ${\text{Pa}}$
-        
-\\ \midrule
-Equation & \begin{displaymath}
-           \resizeExpression{q=\mathit{interpY}\left(\text{``TSD.txt''},\mathit{SD},{w_{\mathit{TNT}}}\right)}
-           \end{displaymath}
-\\ \midrule
-Description & \begin{symbDescription}
-              \item{$q$ is the applied load (demand) (${\text{Pa}}$)}
-              \item{$\mathit{interpY}$ is the interpY (Unitless)}
-              \item{$\mathit{SD}$ is the stand off distance (${\text{m}}$)}
-              \item{${w_{\mathit{TNT}}}$ is the equivalent TNT charge mass (${\text{kg}}$)}
-              \end{symbDescription}
-\\ \midrule
-Notes & $q$, or applied load (demand), is the 3 second duration equivalent pressure obtained from \hyperref[Figure:demandVSsod]{Fig:demandVSsod} by interpolation using stand off distance ($\mathit{SD}$) and ${w_{\mathit{TNT}}}$ as parameters. ${w_{\mathit{TNT}}}$ is defined in \hyperref[DD:eqTNTW]{DD:eqTNTW}. $\mathit{SD}$ is the stand off distance as defined in \hyperref[DD:standOffDist]{DD:standOffDist}.
-        
-\\ \midrule
-Source & \cite{astm2009}
-         
-\\ \midrule
-RefBy & \hyperref[IM:isSafeLR]{IM:isSafeLR} and \hyperref[IM:dimlessLoad]{IM:dimlessLoad}
-        
+RefBy & 
 \\ \bottomrule
 \end{tabular}
 \end{minipage}
@@ -806,8 +759,6 @@ \subsubsection{Instance Models}
         
         $\mathit{LDF}$ is defined in \hyperref[DD:loadDurFactor]{DD:loadDurFactor}.
         
-        $J$ is defined in \hyperref[IM:stressDistFac]{IM:stressDistFac}.
-        
 \\ \midrule
 Source & \cite{astm2009}, \cite[(Eqs. 4-5)]{beasonEtAl1998}, and \cite[(Eq. 14)]{campidelli}
          
@@ -818,58 +769,6 @@ \subsubsection{Instance Models}
 \end{tabular}
 \end{minipage}
 
-\medskip
-\noindent
-\begin{minipage}{\textwidth}
-\begin{tabular}{>{\raggedright}p{0.13\textwidth}>{\raggedright\arraybackslash}p{0.82\textwidth}}
-\toprule \textbf{Refname} & \textbf{IM:stressDistFac}
-\phantomsection 
-\label{IM:stressDistFac}
-\\ \midrule
-Label & Stress distribution factor (Function)
-        
-\\ \midrule
-Input & $\mathit{AR}$, $\hat{q}$
-        
-\\ \midrule
-Output & $J$
-         
-\\ \midrule
-Input Constraints & \begin{displaymath}
-                    \resizeExpression{\mathit{AR}\geq{}1}
-                    \end{displaymath}
-\\ \midrule
-Output Constraints & \begin{displaymath}
-                     \resizeExpression{{J_{\text{min}}}\leq{}J\leq{}{J_{\text{max}}}}
-                     \end{displaymath}
-\\ \midrule
-Equation & \begin{displaymath}
-           \resizeExpression{J=\mathit{interpZ}\left(\text{``SDF.txt''},\mathit{AR},\hat{q}\right)}
-           \end{displaymath}
-\\ \midrule
-Description & \begin{symbDescription}
-              \item{$J$ is the stress distribution factor (Function) (Unitless)}
-              \item{$\mathit{interpZ}$ is the interpZ (Unitless)}
-              \item{$\mathit{AR}$ is the aspect ratio (Unitless)}
-              \item{$\hat{q}$ is the dimensionless load (Unitless)}
-              \end{symbDescription}
-\\ \midrule
-Notes & $J$ is obtained by interpolating from data shown in \hyperref[Figure:dimlessloadVSaspect]{Fig:dimlessloadVSaspect}.
-        
-        $\mathit{AR}$ is defined in \hyperref[DD:aspectRatio]{DD:aspectRatio}.
-        
-        $\hat{q}$ is defined in \hyperref[IM:dimlessLoad]{IM:dimlessLoad}.
-        
-\\ \midrule
-Source & \cite{astm2009}
-         
-\\ \midrule
-RefBy & \hyperref[IM:riskFun]{IM:riskFun}
-        
-\\ \bottomrule
-\end{tabular}
-\end{minipage}
-
 \medskip
 \noindent
 \begin{minipage}{\textwidth}
@@ -909,9 +808,7 @@ \subsubsection{Instance Models}
               \item{$b$ is the plate width (short dimension) (${\text{m}}$)}
               \end{symbDescription}
 \\ \midrule
-Notes & ${\hat{q}_{\text{tol}}}$ is defined in \hyperref[IM:tolLoad]{IM:tolLoad}.
-        
-        $E$ comes from \hyperref[assumpSV]{A:standardValues}.
+Notes & $E$ comes from \hyperref[assumpSV]{A:standardValues}.
         
         $h$ is defined in \hyperref[DD:minThick]{DD:minThick} and is based on the nominal thicknesses.
         
@@ -967,9 +864,7 @@ \subsubsection{Instance Models}
               \item{$\mathit{GTF}$ is the glass type factor (Unitless)}
               \end{symbDescription}
 \\ \midrule
-Notes & $q$ is the 3 second duration equivalent pressure, as given in \hyperref[DD:calofDemand]{DD:calofDemand}.
-        
-        $a$ and $b$ are the dimensions of the plate, where ($a\geq{}b$).
+Notes & $a$ and $b$ are the dimensions of the plate, where ($a\geq{}b$).
         
         $E$ comes from \hyperref[assumpSV]{A:standardValues}.
         
@@ -981,58 +876,7 @@ \subsubsection{Instance Models}
 Source & \cite{astm2009} and \cite[(Eq. 7)]{campidelli}
          
 \\ \midrule
-RefBy & \hyperref[IM:stressDistFac]{IM:stressDistFac}
-        
-\\ \bottomrule
-\end{tabular}
-\end{minipage}
-
-\medskip
-\noindent
-\begin{minipage}{\textwidth}
-\begin{tabular}{>{\raggedright}p{0.13\textwidth}>{\raggedright\arraybackslash}p{0.82\textwidth}}
-\toprule \textbf{Refname} & \textbf{IM:tolLoad}
-\phantomsection 
-\label{IM:tolLoad}
-\\ \midrule
-Label & Tolerable load
-        
-\\ \midrule
-Input & $\mathit{AR}$, ${J_{\text{tol}}}$
-        
-\\ \midrule
-Output & ${\hat{q}_{\text{tol}}}$
-         
-\\ \midrule
-Input Constraints & \begin{displaymath}
-                    \resizeExpression{\mathit{AR}\geq{}1}
-                    \end{displaymath}
-\\ \midrule
-Output Constraints & 
-\\ \midrule
-Equation & \begin{displaymath}
-           \resizeExpression{{\hat{q}_{\text{tol}}}=\mathit{interpY}\left(\text{``SDF.txt''},\mathit{AR},{J_{\text{tol}}}\right)}
-           \end{displaymath}
-\\ \midrule
-Description & \begin{symbDescription}
-              \item{${\hat{q}_{\text{tol}}}$ is the tolerable load (Unitless)}
-              \item{$\mathit{interpY}$ is the interpY (Unitless)}
-              \item{$\mathit{AR}$ is the aspect ratio (Unitless)}
-              \item{${J_{\text{tol}}}$ is the tolerable stress distribution factor (Unitless)}
-              \end{symbDescription}
-\\ \midrule
-Notes & ${\hat{q}_{\text{tol}}}$ is obtained by interpolating from data shown in \hyperref[Figure:dimlessloadVSaspect]{Fig:dimlessloadVSaspect}.
-        
-        $\mathit{AR}$ is defined in \hyperref[DD:aspectRatio]{DD:aspectRatio}.
-        
-        ${J_{\text{tol}}}$ is defined in \hyperref[IM:sdfTol]{IM:sdfTol}.
-        
-\\ \midrule
-Source & \cite{astm2009}
-         
-\\ \midrule
-RefBy & \hyperref[IM:nFL]{IM:nFL}
-        
+RefBy & 
 \\ \bottomrule
 \end{tabular}
 \end{minipage}
@@ -1096,8 +940,7 @@ \subsubsection{Instance Models}
 Source & \cite{astm2009}
          
 \\ \midrule
-RefBy & \hyperref[IM:tolLoad]{IM:tolLoad}
-        
+RefBy & 
 \\ \bottomrule
 \end{tabular}
 \end{minipage}
@@ -1286,8 +1129,6 @@ \subsubsection{Instance Models}
         
         $\mathit{LR}$ is defined in \hyperref[IM:calofCapacity]{IM:calofCapacity} and is also called capacity.
         
-        $q$ is the 3 second duration equivalent pressure, as given in \hyperref[DD:calofDemand]{DD:calofDemand}.
-        
 \\ \midrule
 Source & \cite{astm2009}
          
@@ -1421,8 +1262,6 @@ \subsection{Functional Requirements}
 \\
 $\mathit{isSafePb}$ & Probability of glass breakage safety requirement & \hyperref[IM:isSafePb]{IM:isSafePb} & --
 \\
-$J$ & Stress distribution factor (Function) & \hyperref[IM:stressDistFac]{IM:stressDistFac} & --
-\\
 ${J_{\text{tol}}}$ & Tolerable stress distribution factor & \hyperref[IM:sdfTol]{IM:sdfTol} & --
 \\
 $\mathit{LR}$ & Load resistance & \hyperref[IM:calofCapacity]{IM:calofCapacity} & ${\text{Pa}}$
@@ -1432,8 +1271,6 @@ \subsection{Functional Requirements}
 ${P_{\text{b}}}$ & Probability of breakage & \hyperref[IM:probOfBreak]{IM:probOfBreak} & --
 \\
 $\hat{q}$ & Dimensionless load & \hyperref[IM:dimlessLoad]{IM:dimlessLoad} & --
-\\
-${\hat{q}_{\text{tol}}}$ & Tolerable load & \hyperref[IM:tolLoad]{IM:tolLoad} & --
 \label{Table:ReqOutputs}
 \end{longtblr}
 \subsection{Non-Functional Requirements}
@@ -1510,22 +1347,16 @@ \section{Traceability Matrices and Graphs}
 \\
 \hyperref[DD:eqTNTW]{DD:eqTNTW} &  &  &  &  &  &  &  & 
 \\
-\hyperref[DD:calofDemand]{DD:calofDemand} &  &  &  &  &  &  &  & 
-\\
 \hyperref[TM:isSafeProb]{TM:isSafeProb} &  &  &  &  &  &  &  & 
 \\
 \hyperref[TM:isSafeLoad]{TM:isSafeLoad} &  &  &  &  &  &  &  & 
 \\
 \hyperref[IM:riskFun]{IM:riskFun} &  &  &  &  &  &  &  & 
 \\
-\hyperref[IM:stressDistFac]{IM:stressDistFac} &  &  &  &  &  &  &  & 
-\\
 \hyperref[IM:nFL]{IM:nFL} &  &  &  & X &  &  &  & 
 \\
 \hyperref[IM:dimlessLoad]{IM:dimlessLoad} &  &  &  & X &  &  &  & 
 \\
-\hyperref[IM:tolLoad]{IM:tolLoad} &  &  &  &  &  &  &  & 
-\\
 \hyperref[IM:sdfTol]{IM:sdfTol} &  &  &  & X &  &  &  & 
 \\
 \hyperref[IM:probOfBreak]{IM:probOfBreak} &  &  &  &  &  &  &  & 
@@ -1577,78 +1408,72 @@ \section{Traceability Matrices and Graphs}
 \end{longtblr}
 \begin{longtblr}
 [caption={Traceability Matrix Showing the Connections Between Items and Other Sections}]
-{colspec={l l l l l l l l l l l l l l l l l l l l}, rowhead=1, hline{1,Z}=\heavyrulewidth, hline{2}=\lightrulewidth}
-\textbf{} & \textbf{\hyperref[DD:minThick]{DD:minThick}} & \textbf{\hyperref[DD:loadDurFactor]{DD:loadDurFactor}} & \textbf{\hyperref[DD:gTF]{DD:gTF}} & \textbf{\hyperref[DD:standOffDist]{DD:standOffDist}} & \textbf{\hyperref[DD:aspectRatio]{DD:aspectRatio}} & \textbf{\hyperref[DD:eqTNTW]{DD:eqTNTW}} & \textbf{\hyperref[DD:calofDemand]{DD:calofDemand}} & \textbf{\hyperref[TM:isSafeProb]{TM:isSafeProb}} & \textbf{\hyperref[TM:isSafeLoad]{TM:isSafeLoad}} & \textbf{\hyperref[IM:riskFun]{IM:riskFun}} & \textbf{\hyperref[IM:stressDistFac]{IM:stressDistFac}} & \textbf{\hyperref[IM:nFL]{IM:nFL}} & \textbf{\hyperref[IM:dimlessLoad]{IM:dimlessLoad}} & \textbf{\hyperref[IM:tolLoad]{IM:tolLoad}} & \textbf{\hyperref[IM:sdfTol]{IM:sdfTol}} & \textbf{\hyperref[IM:probOfBreak]{IM:probOfBreak}} & \textbf{\hyperref[IM:calofCapacity]{IM:calofCapacity}} & \textbf{\hyperref[IM:isSafePb]{IM:isSafePb}} & \textbf{\hyperref[IM:isSafeLR]{IM:isSafeLR}}
-\\
-\hyperref[DD:minThick]{DD:minThick} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
-\\
-\hyperref[DD:loadDurFactor]{DD:loadDurFactor} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
-\\
-\hyperref[DD:gTF]{DD:gTF} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+{colspec={l l l l l l l l l l l l l l l l l}, rowhead=1, hline{1,Z}=\heavyrulewidth, hline{2}=\lightrulewidth}
+\textbf{} & \textbf{\hyperref[DD:minThick]{DD:minThick}} & \textbf{\hyperref[DD:loadDurFactor]{DD:loadDurFactor}} & \textbf{\hyperref[DD:gTF]{DD:gTF}} & \textbf{\hyperref[DD:standOffDist]{DD:standOffDist}} & \textbf{\hyperref[DD:aspectRatio]{DD:aspectRatio}} & \textbf{\hyperref[DD:eqTNTW]{DD:eqTNTW}} & \textbf{\hyperref[TM:isSafeProb]{TM:isSafeProb}} & \textbf{\hyperref[TM:isSafeLoad]{TM:isSafeLoad}} & \textbf{\hyperref[IM:riskFun]{IM:riskFun}} & \textbf{\hyperref[IM:nFL]{IM:nFL}} & \textbf{\hyperref[IM:dimlessLoad]{IM:dimlessLoad}} & \textbf{\hyperref[IM:sdfTol]{IM:sdfTol}} & \textbf{\hyperref[IM:probOfBreak]{IM:probOfBreak}} & \textbf{\hyperref[IM:calofCapacity]{IM:calofCapacity}} & \textbf{\hyperref[IM:isSafePb]{IM:isSafePb}} & \textbf{\hyperref[IM:isSafeLR]{IM:isSafeLR}}
 \\
-\hyperref[DD:standOffDist]{DD:standOffDist} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[DD:minThick]{DD:minThick} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[DD:aspectRatio]{DD:aspectRatio} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[DD:loadDurFactor]{DD:loadDurFactor} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[DD:eqTNTW]{DD:eqTNTW} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[DD:gTF]{DD:gTF} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[DD:calofDemand]{DD:calofDemand} &  &  &  & X &  & X &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[DD:standOffDist]{DD:standOffDist} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[TM:isSafeProb]{TM:isSafeProb} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[DD:aspectRatio]{DD:aspectRatio} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[TM:isSafeLoad]{TM:isSafeLoad} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[DD:eqTNTW]{DD:eqTNTW} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[IM:riskFun]{IM:riskFun} & X & X &  &  &  &  &  &  &  &  & X &  &  &  &  &  &  &  & 
+\hyperref[TM:isSafeProb]{TM:isSafeProb} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[IM:stressDistFac]{IM:stressDistFac} &  &  &  &  & X &  &  &  &  &  &  &  & X &  &  &  &  &  & 
+\hyperref[TM:isSafeLoad]{TM:isSafeLoad} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[IM:nFL]{IM:nFL} & X &  &  &  &  &  &  &  &  &  &  &  &  & X &  &  &  &  & 
+\hyperref[IM:riskFun]{IM:riskFun} & X & X &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[IM:dimlessLoad]{IM:dimlessLoad} & X &  & X &  &  &  & X &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[IM:nFL]{IM:nFL} & X &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[IM:tolLoad]{IM:tolLoad} &  &  &  &  & X &  &  &  &  &  &  &  &  &  & X &  &  &  & 
+\hyperref[IM:dimlessLoad]{IM:dimlessLoad} & X &  & X &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[IM:sdfTol]{IM:sdfTol} & X & X &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[IM:sdfTol]{IM:sdfTol} & X & X &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[IM:probOfBreak]{IM:probOfBreak} &  &  &  &  &  &  &  &  &  & X &  &  &  &  &  &  &  &  & 
+\hyperref[IM:probOfBreak]{IM:probOfBreak} &  &  &  &  &  &  &  &  & X &  &  &  &  &  &  & 
 \\
-\hyperref[IM:calofCapacity]{IM:calofCapacity} &  &  & X &  &  &  &  &  &  &  &  & X &  &  &  &  &  &  & 
+\hyperref[IM:calofCapacity]{IM:calofCapacity} &  &  & X &  &  &  &  &  &  & X &  &  &  &  &  & 
 \\
-\hyperref[IM:isSafePb]{IM:isSafePb} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & X &  &  & X
+\hyperref[IM:isSafePb]{IM:isSafePb} &  &  &  &  &  &  &  &  &  &  &  &  & X &  &  & X
 \\
-\hyperref[IM:isSafeLR]{IM:isSafeLR} &  &  &  &  &  &  & X &  &  &  &  &  &  &  &  &  & X & X & 
+\hyperref[IM:isSafeLR]{IM:isSafeLR} &  &  &  &  &  &  &  &  &  &  &  &  &  & X & X & 
 \label{Table:TraceMatRefvsRef}
 \end{longtblr}
 \begin{longtblr}
 [caption={Traceability Matrix Showing the Connections Between Requirements, Goal Statements and Other Items}]
-{colspec={l l l l l l l l l l l l l l l l l l l l l l l l l l l l l l l l}, rowhead=1, hline{1,Z}=\heavyrulewidth, hline{2}=\lightrulewidth}
-\textbf{} & \textbf{\hyperref[DD:minThick]{DD:minThick}} & \textbf{\hyperref[DD:loadDurFactor]{DD:loadDurFactor}} & \textbf{\hyperref[DD:gTF]{DD:gTF}} & \textbf{\hyperref[DD:standOffDist]{DD:standOffDist}} & \textbf{\hyperref[DD:aspectRatio]{DD:aspectRatio}} & \textbf{\hyperref[DD:eqTNTW]{DD:eqTNTW}} & \textbf{\hyperref[DD:calofDemand]{DD:calofDemand}} & \textbf{\hyperref[TM:isSafeProb]{TM:isSafeProb}} & \textbf{\hyperref[TM:isSafeLoad]{TM:isSafeLoad}} & \textbf{\hyperref[IM:riskFun]{IM:riskFun}} & \textbf{\hyperref[IM:stressDistFac]{IM:stressDistFac}} & \textbf{\hyperref[IM:nFL]{IM:nFL}} & \textbf{\hyperref[IM:dimlessLoad]{IM:dimlessLoad}} & \textbf{\hyperref[IM:tolLoad]{IM:tolLoad}} & \textbf{\hyperref[IM:sdfTol]{IM:sdfTol}} & \textbf{\hyperref[IM:probOfBreak]{IM:probOfBreak}} & \textbf{\hyperref[IM:calofCapacity]{IM:calofCapacity}} & \textbf{\hyperref[IM:isSafePb]{IM:isSafePb}} & \textbf{\hyperref[IM:isSafeLR]{IM:isSafeLR}} & \textbf{\hyperref[inputValues]{FR:Input-Values}} & \textbf{\hyperref[sysSetValsFollowingAssumps]{FR:System-Set-Values-Following-Assumptions}} & \textbf{\hyperref[checkInputWithDataCons]{FR:Check-Input-with-Data\_Constraints}} & \textbf{\hyperref[outputValsAndKnownValues]{FR:Output-Values-and-Known-Values}} & \textbf{\hyperref[checkGlassSafety]{FR:Check-Glass-Safety}} & \textbf{\hyperref[outputValues]{FR:Output-Values}} & \textbf{\hyperref[correct]{NFR:Correctness}} & \textbf{\hyperref[verifiable]{NFR:Verifiability}} & \textbf{\hyperref[understandable]{NFR:Understandability}} & \textbf{\hyperref[reusable]{NFR:Reusability}} & \textbf{\hyperref[maintainable]{NFR:Maintainability}} & \textbf{\hyperref[portable]{NFR:Portablity}}
+{colspec={l l l l l l l l l l l l l l l l l l l l l l l l l l l l l}, rowhead=1, hline{1,Z}=\heavyrulewidth, hline{2}=\lightrulewidth}
+\textbf{} & \textbf{\hyperref[DD:minThick]{DD:minThick}} & \textbf{\hyperref[DD:loadDurFactor]{DD:loadDurFactor}} & \textbf{\hyperref[DD:gTF]{DD:gTF}} & \textbf{\hyperref[DD:standOffDist]{DD:standOffDist}} & \textbf{\hyperref[DD:aspectRatio]{DD:aspectRatio}} & \textbf{\hyperref[DD:eqTNTW]{DD:eqTNTW}} & \textbf{\hyperref[TM:isSafeProb]{TM:isSafeProb}} & \textbf{\hyperref[TM:isSafeLoad]{TM:isSafeLoad}} & \textbf{\hyperref[IM:riskFun]{IM:riskFun}} & \textbf{\hyperref[IM:nFL]{IM:nFL}} & \textbf{\hyperref[IM:dimlessLoad]{IM:dimlessLoad}} & \textbf{\hyperref[IM:sdfTol]{IM:sdfTol}} & \textbf{\hyperref[IM:probOfBreak]{IM:probOfBreak}} & \textbf{\hyperref[IM:calofCapacity]{IM:calofCapacity}} & \textbf{\hyperref[IM:isSafePb]{IM:isSafePb}} & \textbf{\hyperref[IM:isSafeLR]{IM:isSafeLR}} & \textbf{\hyperref[inputValues]{FR:Input-Values}} & \textbf{\hyperref[sysSetValsFollowingAssumps]{FR:System-Set-Values-Following-Assumptions}} & \textbf{\hyperref[checkInputWithDataCons]{FR:Check-Input-with-Data\_Constraints}} & \textbf{\hyperref[outputValsAndKnownValues]{FR:Output-Values-and-Known-Values}} & \textbf{\hyperref[checkGlassSafety]{FR:Check-Glass-Safety}} & \textbf{\hyperref[outputValues]{FR:Output-Values}} & \textbf{\hyperref[correct]{NFR:Correctness}} & \textbf{\hyperref[verifiable]{NFR:Verifiability}} & \textbf{\hyperref[understandable]{NFR:Understandability}} & \textbf{\hyperref[reusable]{NFR:Reusability}} & \textbf{\hyperref[maintainable]{NFR:Maintainability}} & \textbf{\hyperref[portable]{NFR:Portablity}}
 \\
-\hyperref[willBreakGS]{GS:Predict-Glass-Withstands-Explosion} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[willBreakGS]{GS:Predict-Glass-Withstands-Explosion} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[inputValues]{FR:Input-Values} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[inputValues]{FR:Input-Values} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[sysSetValsFollowingAssumps]{FR:System-Set-Values-Following-Assumptions} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[sysSetValsFollowingAssumps]{FR:System-Set-Values-Following-Assumptions} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[checkInputWithDataCons]{FR:Check-Input-with-Data\_Constraints} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[checkInputWithDataCons]{FR:Check-Input-with-Data\_Constraints} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[outputValsAndKnownValues]{FR:Output-Values-and-Known-Values} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & X & X &  &  &  &  &  &  &  &  &  & 
+\hyperref[outputValsAndKnownValues]{FR:Output-Values-and-Known-Values} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & X & X &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[checkGlassSafety]{FR:Check-Glass-Safety} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & X & X &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[checkGlassSafety]{FR:Check-Glass-Safety} &  &  &  &  &  &  &  &  &  &  &  &  &  &  & X & X &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[outputValues]{FR:Output-Values} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[outputValues]{FR:Output-Values} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[correct]{NFR:Correctness} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[correct]{NFR:Correctness} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[verifiable]{NFR:Verifiability} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[verifiable]{NFR:Verifiability} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[understandable]{NFR:Understandability} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[understandable]{NFR:Understandability} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[reusable]{NFR:Reusability} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[reusable]{NFR:Reusability} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[maintainable]{NFR:Maintainability} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[maintainable]{NFR:Maintainability} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \\
-\hyperref[portable]{NFR:Portablity} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
+\hyperref[portable]{NFR:Portablity} &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  &  & 
 \label{Table:TraceMatAllvsR}
 \end{longtblr}
 The purpose of the traceability graphs is also to provide easy references on what has to be additionally modified if a certain component is changed. The arrows in the graphs represent dependencies. The component at the tail of an arrow is depended on by the component at the head of that arrow. Therefore, if a component is changed, the components that it points to should also be changed. \hyperref[Figure:TraceGraphAvsA]{Fig:TraceGraphAvsA} shows the dependencies of assumptions on each other. \hyperref[Figure:TraceGraphAvsAll]{Fig:TraceGraphAvsAll} shows the dependencies of data definitions, theoretical models, general definitions, instance models, requirements, likely changes, and unlikely changes on the assumptions. \hyperref[Figure:TraceGraphRefvsRef]{Fig:TraceGraphRefvsRef} shows the dependencies of data definitions, theoretical models, general definitions, and instance models on each other. \hyperref[Figure:TraceGraphAllvsR]{Fig:TraceGraphAllvsR} shows the dependencies of requirements and goal statements on the data definitions, theoretical models, general definitions, and instance models. \hyperref[Figure:TraceGraphAllvsAll]{Fig:TraceGraphAllvsAll} shows the dependencies of dependencies of assumptions, models, definitions, requirements, goals, and changes with each other.
diff --git a/code/stable/glassbr/SRS/mdBook/src/SecDDs.md b/code/stable/glassbr/SRS/mdBook/src/SecDDs.md
index fc5de77b614..73ae796561d 100644
--- a/code/stable/glassbr/SRS/mdBook/src/SecDDs.md
+++ b/code/stable/glassbr/SRS/mdBook/src/SecDDs.md
@@ -67,7 +67,7 @@ This section collects and defines all the data needed to build the instance mode
 |Equation   |\\[\mathit{SD}=\sqrt{{\mathit{SD}\_{\text{x}}}^{2}+{\mathit{SD}\_{\text{y}}}^{2}+{\mathit{SD}\_{\text{z}}}^{2}}\\]                                                                                                                                                                                                                                                                                         |
 |Description|<ul><li>\\(\mathit{SD}\\) is the stand off distance (\\({\text{m}}\\))</li><li>\\({\mathit{SD}\_{\text{x}}}\\) is the stand off distance (\\(x\\)-component) (\\({\text{m}}\\))</li><li>\\({\mathit{SD}\_{\text{y}}}\\) is the stand off distance (\\(y\\)-component) (\\({\text{m}}\\))</li><li>\\({\mathit{SD}\_{\text{z}}}\\) is the stand off distance (\\(z\\)-component) (\\({\text{m}}\\))</li></ul>|
 |Source     |[astm2009](./SecReferences.md#astm2009)                                                                                                                                                                                                                                                                                                                                                                    |
-|RefBy      |[DD:calofDemand](./SecDDs.md#DD:calofDemand)                                                                                                                                                                                                                                                                                                                                                               |
+|RefBy      |                                                                                                                                                                                                                                                                                                                                                                                                           |
 
 <div align="center">
 
@@ -84,7 +84,7 @@ This section collects and defines all the data needed to build the instance mode
 |Description|<ul><li>\\(\mathit{AR}\\) is the aspect ratio (Unitless)</li><li>\\(a\\) is the plate length (long dimension) (\\({\text{m}}\\))</li><li>\\(b\\) is the plate width (short dimension) (\\({\text{m}}\\))</li></ul>|
 |Notes      |<ul><li>\\(a\\) and \\(b\\) are the dimensions of the plate, where (\\(a\geq{}b\\)).</li></ul>                                                                                                                    |
 |Source     |[astm2009](./SecReferences.md#astm2009)                                                                                                                                                                           |
-|RefBy      |[IM:tolLoad](./SecIMs.md#IM:tolLoad) and [IM:stressDistFac](./SecIMs.md#IM:stressDistFac)                                                                                                                         |
+|RefBy      |                                                                                                                                                                                                                  |
 
 <div align="center">
 
@@ -100,21 +100,4 @@ This section collects and defines all the data needed to build the instance mode
 |Equation   |\\[{w\_{\mathit{TNT}}}=w\\,\mathit{TNT}\\]                                                                                                                                                                                   |
 |Description|<ul><li>\\({w\_{\mathit{TNT}}}\\) is the equivalent TNT charge mass (\\({\text{kg}}\\))</li><li>\\(w\\) is the charge weight (\\({\text{kg}}\\))</li><li>\\(\mathit{TNT}\\) is the TNT equivalent factor (Unitless)</li></ul>|
 |Source     |[astm2009](./SecReferences.md#astm2009)                                                                                                                                                                                      |
-|RefBy      |[DD:calofDemand](./SecDDs.md#DD:calofDemand)                                                                                                                                                                                 |
-
-<div align="center">
-
-## Applied load (demand) {#DD:calofDemand}
-
-</div>
-
-|Refname    |DD:calofDemand                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-|:----------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|Label      |Applied load (demand)                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-|Symbol     |\\(q\\)                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-|Units      |\\({\text{Pa}}\\)                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-|Equation   |\\[q=\mathit{interpY}\left(\text{\\(\``\\)TSD.txt''},\mathit{SD},{w\_{\mathit{TNT}}}\right)\\]                                                                                                                                                                                                                                                                                                                                                                         |
-|Description|<ul><li>\\(q\\) is the applied load (demand) (\\({\text{Pa}}\\))</li><li>\\(\mathit{interpY}\\) is the interpY (Unitless)</li><li>\\(\mathit{SD}\\) is the stand off distance (\\({\text{m}}\\))</li><li>\\({w\_{\mathit{TNT}}}\\) is the equivalent TNT charge mass (\\({\text{kg}}\\))</li></ul>                                                                                                                                                                     |
-|Notes      |<ul><li>\\(q\\), or applied load (demand), is the 3 second duration equivalent pressure obtained from [Fig:demandVSsod](./SecAppendix.md#Figure:demandVSsod) by interpolation using stand off distance (\\(\mathit{SD}\\)) and \\({w\_{\mathit{TNT}}}\\) as parameters. \\({w\_{\mathit{TNT}}}\\) is defined in [DD:eqTNTW](./SecDDs.md#DD:eqTNTW). \\(\mathit{SD}\\) is the stand off distance as defined in [DD:standOffDist](./SecDDs.md#DD:standOffDist).</li></ul>|
-|Source     |[astm2009](./SecReferences.md#astm2009)                                                                                                                                                                                                                                                                                                                                                                                                                                |
-|RefBy      |[IM:isSafeLR](./SecIMs.md#IM:isSafeLR) and [IM:dimlessLoad](./SecIMs.md#IM:dimlessLoad)                                                                                                                                                                                                                                                                                                                                                                                |
+|RefBy      |                                                                                                                                                                                                                             |
diff --git a/code/stable/glassbr/SRS/mdBook/src/SecFRs.md b/code/stable/glassbr/SRS/mdBook/src/SecFRs.md
index 322a748d04b..50c7bd041e8 100644
--- a/code/stable/glassbr/SRS/mdBook/src/SecFRs.md
+++ b/code/stable/glassbr/SRS/mdBook/src/SecFRs.md
@@ -62,20 +62,18 @@ Output-Values: Output the values from the table for [Required Outputs](./SecFRs.
 
 <div id="Table:ReqOutputs"></div>
 
-|Symbol                       |Description                                           |Source                                          |Units            |
-|:----------------------------|:-----------------------------------------------------|:-----------------------------------------------|:----------------|
-|\\(\mathit{AR}\\)            |Aspect ratio                                          |[DD:aspectRatio](./SecDDs.md#DD:aspectRatio)    |--               |
-|\\(B\\)                      |Risk of failure                                       |[IM:riskFun](./SecIMs.md#IM:riskFun)            |--               |
-|\\(\mathit{GTF}\\)           |Glass type factor                                     |[DD:gTF](./SecDDs.md#DD:gTF)                    |--               |
-|\\(h\\)                      |Minimum thickness                                     |[DD:minThick](./SecDDs.md#DD:minThick)          |\\({\text{m}}\\) |
-|\\(\mathit{isSafeLR}\\)      |3 second load equivalent resistance safety requirement|[IM:isSafeLR](./SecIMs.md#IM:isSafeLR)          |--               |
-|\\(\mathit{isSafePb}\\)      |Probability of glass breakage safety requirement      |[IM:isSafePb](./SecIMs.md#IM:isSafePb)          |--               |
-|\\(J\\)                      |Stress distribution factor (Function)                 |[IM:stressDistFac](./SecIMs.md#IM:stressDistFac)|--               |
-|\\({J\_{\text{tol}}}\\)      |Tolerable stress distribution factor                  |[IM:sdfTol](./SecIMs.md#IM:sdfTol)              |--               |
-|\\(\mathit{LR}\\)            |Load resistance                                       |[IM:calofCapacity](./SecIMs.md#IM:calofCapacity)|\\({\text{Pa}}\\)|
-|\\(\mathit{NFL}\\)           |Non-factored load                                     |[IM:nFL](./SecIMs.md#IM:nFL)                    |\\({\text{Pa}}\\)|
-|\\({P\_{\text{b}}}\\)        |Probability of breakage                               |[IM:probOfBreak](./SecIMs.md#IM:probOfBreak)    |--               |
-|\\(\hat{q}\\)                |Dimensionless load                                    |[IM:dimlessLoad](./SecIMs.md#IM:dimlessLoad)    |--               |
-|\\({\hat{q}\_{\text{tol}}}\\)|Tolerable load                                        |[IM:tolLoad](./SecIMs.md#IM:tolLoad)            |--               |
+|Symbol                 |Description                                           |Source                                          |Units            |
+|:----------------------|:-----------------------------------------------------|:-----------------------------------------------|:----------------|
+|\\(\mathit{AR}\\)      |Aspect ratio                                          |[DD:aspectRatio](./SecDDs.md#DD:aspectRatio)    |--               |
+|\\(B\\)                |Risk of failure                                       |[IM:riskFun](./SecIMs.md#IM:riskFun)            |--               |
+|\\(\mathit{GTF}\\)     |Glass type factor                                     |[DD:gTF](./SecDDs.md#DD:gTF)                    |--               |
+|\\(h\\)                |Minimum thickness                                     |[DD:minThick](./SecDDs.md#DD:minThick)          |\\({\text{m}}\\) |
+|\\(\mathit{isSafeLR}\\)|3 second load equivalent resistance safety requirement|[IM:isSafeLR](./SecIMs.md#IM:isSafeLR)          |--               |
+|\\(\mathit{isSafePb}\\)|Probability of glass breakage safety requirement      |[IM:isSafePb](./SecIMs.md#IM:isSafePb)          |--               |
+|\\({J\_{\text{tol}}}\\)|Tolerable stress distribution factor                  |[IM:sdfTol](./SecIMs.md#IM:sdfTol)              |--               |
+|\\(\mathit{LR}\\)      |Load resistance                                       |[IM:calofCapacity](./SecIMs.md#IM:calofCapacity)|\\({\text{Pa}}\\)|
+|\\(\mathit{NFL}\\)     |Non-factored load                                     |[IM:nFL](./SecIMs.md#IM:nFL)                    |\\({\text{Pa}}\\)|
+|\\({P\_{\text{b}}}\\)  |Probability of breakage                               |[IM:probOfBreak](./SecIMs.md#IM:probOfBreak)    |--               |
+|\\(\hat{q}\\)          |Dimensionless load                                    |[IM:dimlessLoad](./SecIMs.md#IM:dimlessLoad)    |--               |
 
 **<p align="center">Required Outputs</p>**
diff --git a/code/stable/glassbr/SRS/mdBook/src/SecIMs.md b/code/stable/glassbr/SRS/mdBook/src/SecIMs.md
index feb73e77120..8ad96f89d33 100644
--- a/code/stable/glassbr/SRS/mdBook/src/SecIMs.md
+++ b/code/stable/glassbr/SRS/mdBook/src/SecIMs.md
@@ -19,31 +19,12 @@ The goal [GS:Predict-Glass-Withstands-Explosion](./SecGoalStmt.md#willBreakGS) i
 |Output Constraints|                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 |Equation          |\\[B=\frac{k}{\left(a\\,b\right)^{m-1}}\\,\left(E\\,h^{2}\right)^{m}\\,\mathit{LDF}\\,e^{J}\\]                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 |Description       |<ul><li>\\(B\\) is the risk of failure (Unitless)</li><li>\\(k\\) is the surface flaw parameter (\\(\frac{\text{m}^{12}}{\text{N}^{7}}\\))</li><li>\\(a\\) is the plate length (long dimension) (\\({\text{m}}\\))</li><li>\\(b\\) is the plate width (short dimension) (\\({\text{m}}\\))</li><li>\\(m\\) is the surface flaw parameter (\\(\frac{\text{m}^{12}}{\text{N}^{7}}\\))</li><li>\\(E\\) is the modulus of elasticity of glass (\\({\text{Pa}}\\))</li><li>\\(h\\) is the minimum thickness (\\({\text{m}}\\))</li><li>\\(\mathit{LDF}\\) is the load duration factor (Unitless)</li><li>\\(J\\) is the stress distribution factor (Function) (Unitless)</li></ul>|
-|Notes             |<ul><li>\\(a\\) and \\(b\\) are the dimensions of the plate, where (\\(a\geq{}b\\)).</li><li>\\(h\\) is defined in [DD:minThick](./SecDDs.md#DD:minThick) and is based on the nominal thicknesses.</li><li>\\(\mathit{LDF}\\) is defined in [DD:loadDurFactor](./SecDDs.md#DD:loadDurFactor).</li><li>\\(J\\) is defined in [IM:stressDistFac](./SecIMs.md#IM:stressDistFac).</li></ul>                                                                                                                                                                                                                                                                                      |
+|Notes             |<ul><li>\\(a\\) and \\(b\\) are the dimensions of the plate, where (\\(a\geq{}b\\)).</li><li>\\(h\\) is defined in [DD:minThick](./SecDDs.md#DD:minThick) and is based on the nominal thicknesses.</li><li>\\(\mathit{LDF}\\) is defined in [DD:loadDurFactor](./SecDDs.md#DD:loadDurFactor).</li></ul>                                                                                                                                                                                                                                                                                                                                                                      |
 |Source            |[astm2009](./SecReferences.md#astm2009), [beasonEtAl1998](./SecReferences.md#beasonEtAl1998) (Eqs. 4-5), and [campidelli](./SecReferences.md#campidelli) (Eq. 14)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 |RefBy             |[IM:probOfBreak](./SecIMs.md#IM:probOfBreak)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 
 <div align="center">
 
-## Stress distribution factor (Function) {#IM:stressDistFac}
-
-</div>
-
-|Refname           |IM:stressDistFac                                                                                                                                                                                                                                                                                                         |
-|:-----------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|Label             |Stress distribution factor (Function)                                                                                                                                                                                                                                                                                    |
-|Input             |\\(\mathit{AR}\\), \\(\hat{q}\\)                                                                                                                                                                                                                                                                                         |
-|Output            |\\(J\\)                                                                                                                                                                                                                                                                                                                  |
-|Input Constraints |\\[\mathit{AR}\geq{}1\\]                                                                                                                                                                                                                                                                                                 |
-|Output Constraints|\\[{J\_{\text{min}}}\leq{}J\leq{}{J\_{\text{max}}}\\]                                                                                                                                                                                                                                                                    |
-|Equation          |\\[J=\mathit{interpZ}\left(\text{\\(\``\\)SDF.txt''},\mathit{AR},\hat{q}\right)\\]                                                                                                                                                                                                                                       |
-|Description       |<ul><li>\\(J\\) is the stress distribution factor (Function) (Unitless)</li><li>\\(\mathit{interpZ}\\) is the interpZ (Unitless)</li><li>\\(\mathit{AR}\\) is the aspect ratio (Unitless)</li><li>\\(\hat{q}\\) is the dimensionless load (Unitless)</li></ul>                                                           |
-|Notes             |<ul><li>\\(J\\) is obtained by interpolating from data shown in [Fig:dimlessloadVSaspect](./SecAppendix.md#Figure:dimlessloadVSaspect).</li><li>\\(\mathit{AR}\\) is defined in [DD:aspectRatio](./SecDDs.md#DD:aspectRatio).</li><li>\\(\hat{q}\\) is defined in [IM:dimlessLoad](./SecIMs.md#IM:dimlessLoad).</li></ul>|
-|Source            |[astm2009](./SecReferences.md#astm2009)                                                                                                                                                                                                                                                                                  |
-|RefBy             |[IM:riskFun](./SecIMs.md#IM:riskFun)                                                                                                                                                                                                                                                                                     |
-
-<div align="center">
-
 ## Non-factored load {#IM:nFL}
 
 </div>
@@ -57,7 +38,7 @@ The goal [GS:Predict-Glass-Withstands-Explosion](./SecGoalStmt.md#willBreakGS) i
 |Output Constraints|                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 |Equation          |\\[\mathit{NFL}=\frac{{\hat{q}\_{\text{tol}}}\\,E\\,h^{4}}{\left(a\\,b\right)^{2}}\\]                                                                                                                                                                                                                                                                                                                                                         |
 |Description       |<ul><li>\\(\mathit{NFL}\\) is the non-factored load (\\({\text{Pa}}\\))</li><li>\\({\hat{q}\_{\text{tol}}}\\) is the tolerable load (Unitless)</li><li>\\(E\\) is the modulus of elasticity of glass (\\({\text{Pa}}\\))</li><li>\\(h\\) is the minimum thickness (\\({\text{m}}\\))</li><li>\\(a\\) is the plate length (long dimension) (\\({\text{m}}\\))</li><li>\\(b\\) is the plate width (short dimension) (\\({\text{m}}\\))</li></ul>|
-|Notes             |<ul><li>\\({\hat{q}\_{\text{tol}}}\\) is defined in [IM:tolLoad](./SecIMs.md#IM:tolLoad).</li><li>\\(E\\) comes from [A:standardValues](./SecAssumps.md#assumpSV).</li><li>\\(h\\) is defined in [DD:minThick](./SecDDs.md#DD:minThick) and is based on the nominal thicknesses.</li><li>\\(a\\) and \\(b\\) are the dimensions of the plate, where (\\(a\geq{}b\\)).</li></ul>                                                               |
+|Notes             |<ul><li>\\(E\\) comes from [A:standardValues](./SecAssumps.md#assumpSV).</li><li>\\(h\\) is defined in [DD:minThick](./SecDDs.md#DD:minThick) and is based on the nominal thicknesses.</li><li>\\(a\\) and \\(b\\) are the dimensions of the plate, where (\\(a\geq{}b\\)).</li></ul>                                                                                                                                                         |
 |Source            |[astm2009](./SecReferences.md#astm2009)                                                                                                                                                                                                                                                                                                                                                                                                       |
 |RefBy             |[IM:calofCapacity](./SecIMs.md#IM:calofCapacity)                                                                                                                                                                                                                                                                                                                                                                                              |
 
@@ -76,28 +57,9 @@ The goal [GS:Predict-Glass-Withstands-Explosion](./SecGoalStmt.md#willBreakGS) i
 |Output Constraints|                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 |Equation          |\\[\hat{q}=\frac{q\\,\left(a\\,b\right)^{2}}{E\\,h^{4}\\,\mathit{GTF}}\\]                                                                                                                                                                                                                                                                                                                                                                                                                 |
 |Description       |<ul><li>\\(\hat{q}\\) is the dimensionless load (Unitless)</li><li>\\(q\\) is the applied load (demand) (\\({\text{Pa}}\\))</li><li>\\(a\\) is the plate length (long dimension) (\\({\text{m}}\\))</li><li>\\(b\\) is the plate width (short dimension) (\\({\text{m}}\\))</li><li>\\(E\\) is the modulus of elasticity of glass (\\({\text{Pa}}\\))</li><li>\\(h\\) is the minimum thickness (\\({\text{m}}\\))</li><li>\\(\mathit{GTF}\\) is the glass type factor (Unitless)</li></ul>|
-|Notes             |<ul><li>\\(q\\) is the 3 second duration equivalent pressure, as given in [DD:calofDemand](./SecDDs.md#DD:calofDemand).</li><li>\\(a\\) and \\(b\\) are the dimensions of the plate, where (\\(a\geq{}b\\)).</li><li>\\(E\\) comes from [A:standardValues](./SecAssumps.md#assumpSV).</li><li>\\(h\\) is defined in [DD:minThick](./SecDDs.md#DD:minThick) and is based on the nominal thicknesses.</li><li>\\(\mathit{GTF}\\) is defined in [DD:gTF](./SecDDs.md#DD:gTF).</li></ul>      |
+|Notes             |<ul><li>\\(a\\) and \\(b\\) are the dimensions of the plate, where (\\(a\geq{}b\\)).</li><li>\\(E\\) comes from [A:standardValues](./SecAssumps.md#assumpSV).</li><li>\\(h\\) is defined in [DD:minThick](./SecDDs.md#DD:minThick) and is based on the nominal thicknesses.</li><li>\\(\mathit{GTF}\\) is defined in [DD:gTF](./SecDDs.md#DD:gTF).</li></ul>                                                                                                                              |
 |Source            |[astm2009](./SecReferences.md#astm2009) and [campidelli](./SecReferences.md#campidelli) (Eq. 7)                                                                                                                                                                                                                                                                                                                                                                                           |
-|RefBy             |[IM:stressDistFac](./SecIMs.md#IM:stressDistFac)                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-
-<div align="center">
-
-## Tolerable load {#IM:tolLoad}
-
-</div>
-
-|Refname           |IM:tolLoad                                                                                                                                                                                                                                                                                                                                     |
-|:-----------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|Label             |Tolerable load                                                                                                                                                                                                                                                                                                                                 |
-|Input             |\\(\mathit{AR}\\), \\({J\_{\text{tol}}}\\)                                                                                                                                                                                                                                                                                                     |
-|Output            |\\({\hat{q}\_{\text{tol}}}\\)                                                                                                                                                                                                                                                                                                                  |
-|Input Constraints |\\[\mathit{AR}\geq{}1\\]                                                                                                                                                                                                                                                                                                                       |
-|Output Constraints|                                                                                                                                                                                                                                                                                                                                               |
-|Equation          |\\[{\hat{q}\_{\text{tol}}}=\mathit{interpY}\left(\text{\\(\``\\)SDF.txt''},\mathit{AR},{J\_{\text{tol}}}\right)\\]                                                                                                                                                                                                                             |
-|Description       |<ul><li>\\({\hat{q}\_{\text{tol}}}\\) is the tolerable load (Unitless)</li><li>\\(\mathit{interpY}\\) is the interpY (Unitless)</li><li>\\(\mathit{AR}\\) is the aspect ratio (Unitless)</li><li>\\({J\_{\text{tol}}}\\) is the tolerable stress distribution factor (Unitless)</li></ul>                                                      |
-|Notes             |<ul><li>\\({\hat{q}\_{\text{tol}}}\\) is obtained by interpolating from data shown in [Fig:dimlessloadVSaspect](./SecAppendix.md#Figure:dimlessloadVSaspect).</li><li>\\(\mathit{AR}\\) is defined in [DD:aspectRatio](./SecDDs.md#DD:aspectRatio).</li><li>\\({J\_{\text{tol}}}\\) is defined in [IM:sdfTol](./SecIMs.md#IM:sdfTol).</li></ul>|
-|Source            |[astm2009](./SecReferences.md#astm2009)                                                                                                                                                                                                                                                                                                        |
-|RefBy             |[IM:nFL](./SecIMs.md#IM:nFL)                                                                                                                                                                                                                                                                                                                   |
+|RefBy             |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 
 <div align="center">
 
@@ -116,7 +78,7 @@ The goal [GS:Predict-Glass-Withstands-Explosion](./SecGoalStmt.md#willBreakGS) i
 |Description       |<ul><li>\\({J\_{\text{tol}}}\\) is the tolerable stress distribution factor (Unitless)</li><li>\\({P\_{\text{b}\text{tol}}}\\) is the tolerable probability of breakage (Unitless)</li><li>\\(a\\) is the plate length (long dimension) (\\({\text{m}}\\))</li><li>\\(b\\) is the plate width (short dimension) (\\({\text{m}}\\))</li><li>\\(m\\) is the surface flaw parameter (\\(\frac{\text{m}^{12}}{\text{N}^{7}}\\))</li><li>\\(k\\) is the surface flaw parameter (\\(\frac{\text{m}^{12}}{\text{N}^{7}}\\))</li><li>\\(E\\) is the modulus of elasticity of glass (\\({\text{Pa}}\\))</li><li>\\(h\\) is the minimum thickness (\\({\text{m}}\\))</li><li>\\(\mathit{LDF}\\) is the load duration factor (Unitless)</li></ul>|
 |Notes             |<ul><li>\\({P\_{\text{b}\text{tol}}}\\) is entered by the user.</li><li>\\(a\\) and \\(b\\) are the dimensions of the plate, where (\\(a\geq{}b\\)).</li><li>\\(m\\), \\(k\\), and \\(E\\) come from [A:standardValues](./SecAssumps.md#assumpSV).</li><li>\\(h\\) is defined in [DD:minThick](./SecDDs.md#DD:minThick) and is based on the nominal thicknesses.</li><li>\\(\mathit{LDF}\\) is defined in [DD:loadDurFactor](./SecDDs.md#DD:loadDurFactor).</li></ul>                                                                                                                                                                                                                                                                 |
 |Source            |[astm2009](./SecReferences.md#astm2009)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-|RefBy             |[IM:tolLoad](./SecIMs.md#IM:tolLoad)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+|RefBy             |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 
 <div align="center">
 
@@ -181,15 +143,15 @@ The goal [GS:Predict-Glass-Withstands-Explosion](./SecGoalStmt.md#willBreakGS) i
 
 </div>
 
-|Refname           |IM:isSafeLR                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|:-----------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|Label             |Safety Req-LR                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-|Input             |\\(\mathit{LR}\\), \\(q\\)                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-|Output            |\\(\mathit{isSafeLR}\\)                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-|Input Constraints |\\[\mathit{LR}\gt{}0\\]\\[q\gt{}0\\]                                                                                                                                                                                                                                                                                                                                                                                                                           |
-|Output Constraints|                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-|Equation          |\\[\mathit{isSafeLR}=\mathit{LR}\gt{}q\\]                                                                                                                                                                                                                                                                                                                                                                                                                      |
-|Description       |<ul><li>\\(\mathit{isSafeLR}\\) is the 3 second load equivalent resistance safety requirement (Unitless)</li><li>\\(\mathit{LR}\\) is the load resistance (\\({\text{Pa}}\\))</li><li>\\(q\\) is the applied load (demand) (\\({\text{Pa}}\\))</li></ul>                                                                                                                                                                                                       |
-|Notes             |<ul><li>If \\(\mathit{isSafeLR}\\), the glass is considered safe. \\(\mathit{isSafePb}\\) (from [IM:isSafePb](./SecIMs.md#IM:isSafePb)) and \\(\mathit{isSafeLR}\\) are either both True or both False.</li><li>\\(\mathit{LR}\\) is defined in [IM:calofCapacity](./SecIMs.md#IM:calofCapacity) and is also called capacity.</li><li>\\(q\\) is the 3 second duration equivalent pressure, as given in [DD:calofDemand](./SecDDs.md#DD:calofDemand).</li></ul>|
-|Source            |[astm2009](./SecReferences.md#astm2009)                                                                                                                                                                                                                                                                                                                                                                                                                        |
-|RefBy             |[IM:isSafePb](./SecIMs.md#IM:isSafePb) and [FR:Check-Glass-Safety](./SecFRs.md#checkGlassSafety)                                                                                                                                                                                                                                                                                                                                                               |
+|Refname           |IM:isSafeLR                                                                                                                                                                                                                                                                                                                            |
+|:-----------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|Label             |Safety Req-LR                                                                                                                                                                                                                                                                                                                          |
+|Input             |\\(\mathit{LR}\\), \\(q\\)                                                                                                                                                                                                                                                                                                             |
+|Output            |\\(\mathit{isSafeLR}\\)                                                                                                                                                                                                                                                                                                                |
+|Input Constraints |\\[\mathit{LR}\gt{}0\\]\\[q\gt{}0\\]                                                                                                                                                                                                                                                                                                   |
+|Output Constraints|                                                                                                                                                                                                                                                                                                                                       |
+|Equation          |\\[\mathit{isSafeLR}=\mathit{LR}\gt{}q\\]                                                                                                                                                                                                                                                                                              |
+|Description       |<ul><li>\\(\mathit{isSafeLR}\\) is the 3 second load equivalent resistance safety requirement (Unitless)</li><li>\\(\mathit{LR}\\) is the load resistance (\\({\text{Pa}}\\))</li><li>\\(q\\) is the applied load (demand) (\\({\text{Pa}}\\))</li></ul>                                                                               |
+|Notes             |<ul><li>If \\(\mathit{isSafeLR}\\), the glass is considered safe. \\(\mathit{isSafePb}\\) (from [IM:isSafePb](./SecIMs.md#IM:isSafePb)) and \\(\mathit{isSafeLR}\\) are either both True or both False.</li><li>\\(\mathit{LR}\\) is defined in [IM:calofCapacity](./SecIMs.md#IM:calofCapacity) and is also called capacity.</li></ul>|
+|Source            |[astm2009](./SecReferences.md#astm2009)                                                                                                                                                                                                                                                                                                |
+|RefBy             |[IM:isSafePb](./SecIMs.md#IM:isSafePb) and [FR:Check-Glass-Safety](./SecFRs.md#checkGlassSafety)                                                                                                                                                                                                                                       |
diff --git a/code/stable/glassbr/SRS/mdBook/src/SecToS.md b/code/stable/glassbr/SRS/mdBook/src/SecToS.md
index 726a3e07741..713e3be40ca 100644
--- a/code/stable/glassbr/SRS/mdBook/src/SecToS.md
+++ b/code/stable/glassbr/SRS/mdBook/src/SecToS.md
@@ -18,8 +18,6 @@ The symbols used in this document are summarized in the [Table of Symbols](./Sec
 |\\(g\\)                          |Glass type                                                |--                                      |
 |\\(\mathit{GTF}\\)               |Glass type factor                                         |--                                      |
 |\\(h\\)                          |Minimum thickness                                         |\\({\text{m}}\\)                        |
-|\\(\mathit{interpY}\\)           |InterpY                                                   |--                                      |
-|\\(\mathit{interpZ}\\)           |InterpZ                                                   |--                                      |
 |\\(\mathit{isSafeLoad}\\)        |Load resistance safety requirement                        |--                                      |
 |\\(\mathit{isSafeLR}\\)          |3 second load equivalent resistance safety requirement    |--                                      |
 |\\(\mathit{isSafePb}\\)          |Probability of glass breakage safety requirement          |--                                      |
diff --git a/code/stable/glassbr/SRS/mdBook/src/SecTraceMatrices.md b/code/stable/glassbr/SRS/mdBook/src/SecTraceMatrices.md
index 8b8d95677cd..d8cc3ba39b3 100644
--- a/code/stable/glassbr/SRS/mdBook/src/SecTraceMatrices.md
+++ b/code/stable/glassbr/SRS/mdBook/src/SecTraceMatrices.md
@@ -27,14 +27,11 @@ The purpose of the traceability matrices is to provide easy references on what h
 |[DD:standOffDist](./SecDDs.md#DD:standOffDist)                                      |                                       |                                            |                                             |                                            |                                       |                                                |                                          |                                           |
 |[DD:aspectRatio](./SecDDs.md#DD:aspectRatio)                                        |                                       |                                            |                                             |                                            |                                       |                                                |                                          |                                           |
 |[DD:eqTNTW](./SecDDs.md#DD:eqTNTW)                                                  |                                       |                                            |                                             |                                            |                                       |                                                |                                          |                                           |
-|[DD:calofDemand](./SecDDs.md#DD:calofDemand)                                        |                                       |                                            |                                             |                                            |                                       |                                                |                                          |                                           |
 |[TM:isSafeProb](./SecTMs.md#TM:isSafeProb)                                          |                                       |                                            |                                             |                                            |                                       |                                                |                                          |                                           |
 |[TM:isSafeLoad](./SecTMs.md#TM:isSafeLoad)                                          |                                       |                                            |                                             |                                            |                                       |                                                |                                          |                                           |
 |[IM:riskFun](./SecIMs.md#IM:riskFun)                                                |                                       |                                            |                                             |                                            |                                       |                                                |                                          |                                           |
-|[IM:stressDistFac](./SecIMs.md#IM:stressDistFac)                                    |                                       |                                            |                                             |                                            |                                       |                                                |                                          |                                           |
 |[IM:nFL](./SecIMs.md#IM:nFL)                                                        |                                       |                                            |                                             |X                                           |                                       |                                                |                                          |                                           |
 |[IM:dimlessLoad](./SecIMs.md#IM:dimlessLoad)                                        |                                       |                                            |                                             |X                                           |                                       |                                                |                                          |                                           |
-|[IM:tolLoad](./SecIMs.md#IM:tolLoad)                                                |                                       |                                            |                                             |                                            |                                       |                                                |                                          |                                           |
 |[IM:sdfTol](./SecIMs.md#IM:sdfTol)                                                  |                                       |                                            |                                             |X                                           |                                       |                                                |                                          |                                           |
 |[IM:probOfBreak](./SecIMs.md#IM:probOfBreak)                                        |                                       |                                            |                                             |                                            |                                       |                                                |                                          |                                           |
 |[IM:calofCapacity](./SecIMs.md#IM:calofCapacity)                                    |                                       |                                            |                                             |                                            |                                       |                                                |                                          |                                           |
@@ -64,47 +61,44 @@ The purpose of the traceability matrices is to provide easy references on what h
 
 <div id="Table:TraceMatRefvsRef"></div>
 
-|                                                |[DD:minThick](./SecDDs.md#DD:minThick)|[DD:loadDurFactor](./SecDDs.md#DD:loadDurFactor)|[DD:gTF](./SecDDs.md#DD:gTF)|[DD:standOffDist](./SecDDs.md#DD:standOffDist)|[DD:aspectRatio](./SecDDs.md#DD:aspectRatio)|[DD:eqTNTW](./SecDDs.md#DD:eqTNTW)|[DD:calofDemand](./SecDDs.md#DD:calofDemand)|[TM:isSafeProb](./SecTMs.md#TM:isSafeProb)|[TM:isSafeLoad](./SecTMs.md#TM:isSafeLoad)|[IM:riskFun](./SecIMs.md#IM:riskFun)|[IM:stressDistFac](./SecIMs.md#IM:stressDistFac)|[IM:nFL](./SecIMs.md#IM:nFL)|[IM:dimlessLoad](./SecIMs.md#IM:dimlessLoad)|[IM:tolLoad](./SecIMs.md#IM:tolLoad)|[IM:sdfTol](./SecIMs.md#IM:sdfTol)|[IM:probOfBreak](./SecIMs.md#IM:probOfBreak)|[IM:calofCapacity](./SecIMs.md#IM:calofCapacity)|[IM:isSafePb](./SecIMs.md#IM:isSafePb)|[IM:isSafeLR](./SecIMs.md#IM:isSafeLR)|
-|:-----------------------------------------------|:-------------------------------------|:-----------------------------------------------|:---------------------------|:---------------------------------------------|:-------------------------------------------|:---------------------------------|:-------------------------------------------|:-----------------------------------------|:-----------------------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------------|:-------------------------------------------|:-----------------------------------|:---------------------------------|:-------------------------------------------|:-----------------------------------------------|:-------------------------------------|:-------------------------------------|
-|[DD:minThick](./SecDDs.md#DD:minThick)          |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[DD:loadDurFactor](./SecDDs.md#DD:loadDurFactor)|                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[DD:gTF](./SecDDs.md#DD:gTF)                    |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[DD:standOffDist](./SecDDs.md#DD:standOffDist)  |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[DD:aspectRatio](./SecDDs.md#DD:aspectRatio)    |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[DD:eqTNTW](./SecDDs.md#DD:eqTNTW)              |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[DD:calofDemand](./SecDDs.md#DD:calofDemand)    |                                      |                                                |                            |X                                             |                                            |X                                 |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[TM:isSafeProb](./SecTMs.md#TM:isSafeProb)      |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[TM:isSafeLoad](./SecTMs.md#TM:isSafeLoad)      |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[IM:riskFun](./SecIMs.md#IM:riskFun)            |X                                     |X                                               |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |X                                               |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[IM:stressDistFac](./SecIMs.md#IM:stressDistFac)|                                      |                                                |                            |                                              |X                                           |                                  |                                            |                                          |                                          |                                    |                                                |                            |X                                           |                                    |                                  |                                            |                                                |                                      |                                      |
-|[IM:nFL](./SecIMs.md#IM:nFL)                    |X                                     |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |X                                   |                                  |                                            |                                                |                                      |                                      |
-|[IM:dimlessLoad](./SecIMs.md#IM:dimlessLoad)    |X                                     |                                                |X                           |                                              |                                            |                                  |X                                           |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[IM:tolLoad](./SecIMs.md#IM:tolLoad)            |                                      |                                                |                            |                                              |X                                           |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |X                                 |                                            |                                                |                                      |                                      |
-|[IM:sdfTol](./SecIMs.md#IM:sdfTol)              |X                                     |X                                               |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[IM:probOfBreak](./SecIMs.md#IM:probOfBreak)    |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |X                                   |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[IM:calofCapacity](./SecIMs.md#IM:calofCapacity)|                                      |                                                |X                           |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |X                           |                                            |                                    |                                  |                                            |                                                |                                      |                                      |
-|[IM:isSafePb](./SecIMs.md#IM:isSafePb)          |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |X                                           |                                                |                                      |X                                     |
-|[IM:isSafeLR](./SecIMs.md#IM:isSafeLR)          |                                      |                                                |                            |                                              |                                            |                                  |X                                           |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |X                                               |X                                     |                                      |
+|                                                |[DD:minThick](./SecDDs.md#DD:minThick)|[DD:loadDurFactor](./SecDDs.md#DD:loadDurFactor)|[DD:gTF](./SecDDs.md#DD:gTF)|[DD:standOffDist](./SecDDs.md#DD:standOffDist)|[DD:aspectRatio](./SecDDs.md#DD:aspectRatio)|[DD:eqTNTW](./SecDDs.md#DD:eqTNTW)|[TM:isSafeProb](./SecTMs.md#TM:isSafeProb)|[TM:isSafeLoad](./SecTMs.md#TM:isSafeLoad)|[IM:riskFun](./SecIMs.md#IM:riskFun)|[IM:nFL](./SecIMs.md#IM:nFL)|[IM:dimlessLoad](./SecIMs.md#IM:dimlessLoad)|[IM:sdfTol](./SecIMs.md#IM:sdfTol)|[IM:probOfBreak](./SecIMs.md#IM:probOfBreak)|[IM:calofCapacity](./SecIMs.md#IM:calofCapacity)|[IM:isSafePb](./SecIMs.md#IM:isSafePb)|[IM:isSafeLR](./SecIMs.md#IM:isSafeLR)|
+|:-----------------------------------------------|:-------------------------------------|:-----------------------------------------------|:---------------------------|:---------------------------------------------|:-------------------------------------------|:---------------------------------|:-----------------------------------------|:-----------------------------------------|:-----------------------------------|:---------------------------|:-------------------------------------------|:---------------------------------|:-------------------------------------------|:-----------------------------------------------|:-------------------------------------|:-------------------------------------|
+|[DD:minThick](./SecDDs.md#DD:minThick)          |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[DD:loadDurFactor](./SecDDs.md#DD:loadDurFactor)|                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[DD:gTF](./SecDDs.md#DD:gTF)                    |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[DD:standOffDist](./SecDDs.md#DD:standOffDist)  |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[DD:aspectRatio](./SecDDs.md#DD:aspectRatio)    |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[DD:eqTNTW](./SecDDs.md#DD:eqTNTW)              |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[TM:isSafeProb](./SecTMs.md#TM:isSafeProb)      |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[TM:isSafeLoad](./SecTMs.md#TM:isSafeLoad)      |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[IM:riskFun](./SecIMs.md#IM:riskFun)            |X                                     |X                                               |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[IM:nFL](./SecIMs.md#IM:nFL)                    |X                                     |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[IM:dimlessLoad](./SecIMs.md#IM:dimlessLoad)    |X                                     |                                                |X                           |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[IM:sdfTol](./SecIMs.md#IM:sdfTol)              |X                                     |X                                               |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[IM:probOfBreak](./SecIMs.md#IM:probOfBreak)    |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |X                                   |                            |                                            |                                  |                                            |                                                |                                      |                                      |
+|[IM:calofCapacity](./SecIMs.md#IM:calofCapacity)|                                      |                                                |X                           |                                              |                                            |                                  |                                          |                                          |                                    |X                           |                                            |                                  |                                            |                                                |                                      |                                      |
+|[IM:isSafePb](./SecIMs.md#IM:isSafePb)          |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |X                                           |                                                |                                      |X                                     |
+|[IM:isSafeLR](./SecIMs.md#IM:isSafeLR)          |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |X                                               |X                                     |                                      |
 
 **<p align="center">Traceability Matrix Showing the Connections Between Items and Other Sections</p>**
 
 <div id="Table:TraceMatAllvsR"></div>
 
-|                                                                                    |[DD:minThick](./SecDDs.md#DD:minThick)|[DD:loadDurFactor](./SecDDs.md#DD:loadDurFactor)|[DD:gTF](./SecDDs.md#DD:gTF)|[DD:standOffDist](./SecDDs.md#DD:standOffDist)|[DD:aspectRatio](./SecDDs.md#DD:aspectRatio)|[DD:eqTNTW](./SecDDs.md#DD:eqTNTW)|[DD:calofDemand](./SecDDs.md#DD:calofDemand)|[TM:isSafeProb](./SecTMs.md#TM:isSafeProb)|[TM:isSafeLoad](./SecTMs.md#TM:isSafeLoad)|[IM:riskFun](./SecIMs.md#IM:riskFun)|[IM:stressDistFac](./SecIMs.md#IM:stressDistFac)|[IM:nFL](./SecIMs.md#IM:nFL)|[IM:dimlessLoad](./SecIMs.md#IM:dimlessLoad)|[IM:tolLoad](./SecIMs.md#IM:tolLoad)|[IM:sdfTol](./SecIMs.md#IM:sdfTol)|[IM:probOfBreak](./SecIMs.md#IM:probOfBreak)|[IM:calofCapacity](./SecIMs.md#IM:calofCapacity)|[IM:isSafePb](./SecIMs.md#IM:isSafePb)|[IM:isSafeLR](./SecIMs.md#IM:isSafeLR)|[FR:Input-Values](./SecFRs.md#inputValues)|[FR:System-Set-Values-Following-Assumptions](./SecFRs.md#sysSetValsFollowingAssumps)|[FR:Check-Input-with-Data_Constraints](./SecFRs.md#checkInputWithDataCons)|[FR:Output-Values-and-Known-Values](./SecFRs.md#outputValsAndKnownValues)|[FR:Check-Glass-Safety](./SecFRs.md#checkGlassSafety)|[FR:Output-Values](./SecFRs.md#outputValues)|[NFR:Correctness](./SecNFRs.md#correct)|[NFR:Verifiability](./SecNFRs.md#verifiable)|[NFR:Understandability](./SecNFRs.md#understandable)|[NFR:Reusability](./SecNFRs.md#reusable)|[NFR:Maintainability](./SecNFRs.md#maintainable)|[NFR:Portablity](./SecNFRs.md#portable)|
-|:-----------------------------------------------------------------------------------|:-------------------------------------|:-----------------------------------------------|:---------------------------|:---------------------------------------------|:-------------------------------------------|:---------------------------------|:-------------------------------------------|:-----------------------------------------|:-----------------------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------------|:-------------------------------------------|:-----------------------------------|:---------------------------------|:-------------------------------------------|:-----------------------------------------------|:-------------------------------------|:-------------------------------------|:-----------------------------------------|:-----------------------------------------------------------------------------------|:-------------------------------------------------------------------------|:------------------------------------------------------------------------|:----------------------------------------------------|:-------------------------------------------|:--------------------------------------|:-------------------------------------------|:---------------------------------------------------|:---------------------------------------|:-----------------------------------------------|:--------------------------------------|
-|[GS:Predict-Glass-Withstands-Explosion](./SecGoalStmt.md#willBreakGS)               |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[FR:Input-Values](./SecFRs.md#inputValues)                                          |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[FR:System-Set-Values-Following-Assumptions](./SecFRs.md#sysSetValsFollowingAssumps)|                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[FR:Check-Input-with-Data_Constraints](./SecFRs.md#checkInputWithDataCons)          |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[FR:Output-Values-and-Known-Values](./SecFRs.md#outputValsAndKnownValues)           |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |X                                         |X                                                                                   |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[FR:Check-Glass-Safety](./SecFRs.md#checkGlassSafety)                               |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |X                                     |X                                     |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[FR:Output-Values](./SecFRs.md#outputValues)                                        |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[NFR:Correctness](./SecNFRs.md#correct)                                             |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[NFR:Verifiability](./SecNFRs.md#verifiable)                                        |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[NFR:Understandability](./SecNFRs.md#understandable)                                |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[NFR:Reusability](./SecNFRs.md#reusable)                                            |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[NFR:Maintainability](./SecNFRs.md#maintainable)                                    |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
-|[NFR:Portablity](./SecNFRs.md#portable)                                             |                                      |                                                |                            |                                              |                                            |                                  |                                            |                                          |                                          |                                    |                                                |                            |                                            |                                    |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|                                                                                    |[DD:minThick](./SecDDs.md#DD:minThick)|[DD:loadDurFactor](./SecDDs.md#DD:loadDurFactor)|[DD:gTF](./SecDDs.md#DD:gTF)|[DD:standOffDist](./SecDDs.md#DD:standOffDist)|[DD:aspectRatio](./SecDDs.md#DD:aspectRatio)|[DD:eqTNTW](./SecDDs.md#DD:eqTNTW)|[TM:isSafeProb](./SecTMs.md#TM:isSafeProb)|[TM:isSafeLoad](./SecTMs.md#TM:isSafeLoad)|[IM:riskFun](./SecIMs.md#IM:riskFun)|[IM:nFL](./SecIMs.md#IM:nFL)|[IM:dimlessLoad](./SecIMs.md#IM:dimlessLoad)|[IM:sdfTol](./SecIMs.md#IM:sdfTol)|[IM:probOfBreak](./SecIMs.md#IM:probOfBreak)|[IM:calofCapacity](./SecIMs.md#IM:calofCapacity)|[IM:isSafePb](./SecIMs.md#IM:isSafePb)|[IM:isSafeLR](./SecIMs.md#IM:isSafeLR)|[FR:Input-Values](./SecFRs.md#inputValues)|[FR:System-Set-Values-Following-Assumptions](./SecFRs.md#sysSetValsFollowingAssumps)|[FR:Check-Input-with-Data_Constraints](./SecFRs.md#checkInputWithDataCons)|[FR:Output-Values-and-Known-Values](./SecFRs.md#outputValsAndKnownValues)|[FR:Check-Glass-Safety](./SecFRs.md#checkGlassSafety)|[FR:Output-Values](./SecFRs.md#outputValues)|[NFR:Correctness](./SecNFRs.md#correct)|[NFR:Verifiability](./SecNFRs.md#verifiable)|[NFR:Understandability](./SecNFRs.md#understandable)|[NFR:Reusability](./SecNFRs.md#reusable)|[NFR:Maintainability](./SecNFRs.md#maintainable)|[NFR:Portablity](./SecNFRs.md#portable)|
+|:-----------------------------------------------------------------------------------|:-------------------------------------|:-----------------------------------------------|:---------------------------|:---------------------------------------------|:-------------------------------------------|:---------------------------------|:-----------------------------------------|:-----------------------------------------|:-----------------------------------|:---------------------------|:-------------------------------------------|:---------------------------------|:-------------------------------------------|:-----------------------------------------------|:-------------------------------------|:-------------------------------------|:-----------------------------------------|:-----------------------------------------------------------------------------------|:-------------------------------------------------------------------------|:------------------------------------------------------------------------|:----------------------------------------------------|:-------------------------------------------|:--------------------------------------|:-------------------------------------------|:---------------------------------------------------|:---------------------------------------|:-----------------------------------------------|:--------------------------------------|
+|[GS:Predict-Glass-Withstands-Explosion](./SecGoalStmt.md#willBreakGS)               |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[FR:Input-Values](./SecFRs.md#inputValues)                                          |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[FR:System-Set-Values-Following-Assumptions](./SecFRs.md#sysSetValsFollowingAssumps)|                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[FR:Check-Input-with-Data_Constraints](./SecFRs.md#checkInputWithDataCons)          |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[FR:Output-Values-and-Known-Values](./SecFRs.md#outputValsAndKnownValues)           |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |X                                         |X                                                                                   |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[FR:Check-Glass-Safety](./SecFRs.md#checkGlassSafety)                               |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |X                                     |X                                     |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[FR:Output-Values](./SecFRs.md#outputValues)                                        |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[NFR:Correctness](./SecNFRs.md#correct)                                             |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[NFR:Verifiability](./SecNFRs.md#verifiable)                                        |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[NFR:Understandability](./SecNFRs.md#understandable)                                |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[NFR:Reusability](./SecNFRs.md#reusable)                                            |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[NFR:Maintainability](./SecNFRs.md#maintainable)                                    |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
+|[NFR:Portablity](./SecNFRs.md#portable)                                             |                                      |                                                |                            |                                              |                                            |                                  |                                          |                                          |                                    |                            |                                            |                                  |                                            |                                                |                                      |                                      |                                          |                                                                                    |                                                                          |                                                                         |                                                     |                                            |                                       |                                            |                                                    |                                        |                                                |                                       |
 
 **<p align="center">Traceability Matrix Showing the Connections Between Requirements, Goal Statements and Other Items</p>**
 
diff --git a/code/stable/glassbr/TraceyGraph/allvsall.dot b/code/stable/glassbr/TraceyGraph/allvsall.dot
index 6755cc4cb77..9a5f91ca1a5 100644
--- a/code/stable/glassbr/TraceyGraph/allvsall.dot
+++ b/code/stable/glassbr/TraceyGraph/allvsall.dot
@@ -2,22 +2,13 @@ digraph allvsall {
 	instance:assumpLDFC -> instance:assumpSV;
 	dataDefn:loadDurFactor -> instance:assumpSV;
 	dataDefn:loadDurFactor -> instance:assumpLDFC;
-	dataDefn:demandq -> dataDefn:stdOffDist;
-	dataDefn:demandq -> dataDefn:eqTNTChar;
 	theory:riskFun -> dataDefn:minThick;
 	theory:riskFun -> dataDefn:loadDurFactor;
-	theory:riskFun -> theory:stressDistFac;
-	theory:stressDistFac -> dataDefn:aR;
-	theory:stressDistFac -> theory:dimlessLoad;
 	theory:nFL -> instance:assumpSV;
 	theory:nFL -> dataDefn:minThick;
-	theory:nFL -> theory:tolLoad;
 	theory:dimlessLoad -> instance:assumpSV;
 	theory:dimlessLoad -> dataDefn:minThick;
 	theory:dimlessLoad -> dataDefn:glassTypeFac;
-	theory:dimlessLoad -> dataDefn:demandq;
-	theory:tolLoad -> dataDefn:aR;
-	theory:tolLoad -> theory:sdfTol;
 	theory:sdfTol -> instance:assumpSV;
 	theory:sdfTol -> dataDefn:minThick;
 	theory:sdfTol -> dataDefn:loadDurFactor;
@@ -26,7 +17,6 @@ digraph allvsall {
 	theory:lResistance -> theory:nFL;
 	theory:isSafePb -> theory:probBr;
 	theory:isSafePb -> theory:isSafeLR;
-	theory:isSafeLR -> dataDefn:demandq;
 	theory:isSafeLR -> theory:lResistance;
 	theory:isSafeLR -> theory:isSafePb;
 	instance:outputValsAndKnownValues -> instance:inputValues;
@@ -62,11 +52,10 @@ digraph allvsall {
 	dataDefn:stdOffDist	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:standOffDist"];
 	dataDefn:aR	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:aspectRatio"];
 	dataDefn:eqTNTChar	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:eqTNTW"];
-	dataDefn:demandq	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:calofDemand"];
 
 	subgraph DD {
 	rank="same"
-	{dataDefn:minThick, dataDefn:loadDurFactor, dataDefn:glassTypeFac, dataDefn:stdOffDist, dataDefn:aR, dataDefn:eqTNTChar, dataDefn:demandq}
+	{dataDefn:minThick, dataDefn:loadDurFactor, dataDefn:glassTypeFac, dataDefn:stdOffDist, dataDefn:aR, dataDefn:eqTNTChar}
 	}
 
 	theory:isSafeProb	[shape=box, color=black, style=filled, fillcolor=pink, label="TM:isSafeProb"];
@@ -78,10 +67,8 @@ digraph allvsall {
 	}
 
 	theory:riskFun	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:riskFun"];
-	theory:stressDistFac	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:stressDistFac"];
 	theory:nFL	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:nFL"];
 	theory:dimlessLoad	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:dimlessLoad"];
-	theory:tolLoad	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:tolLoad"];
 	theory:sdfTol	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:sdfTol"];
 	theory:probBr	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:probOfBreak"];
 	theory:lResistance	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:calofCapacity"];
@@ -90,7 +77,7 @@ digraph allvsall {
 
 	subgraph IM {
 	rank="same"
-	{theory:riskFun, theory:stressDistFac, theory:nFL, theory:dimlessLoad, theory:tolLoad, theory:sdfTol, theory:probBr, theory:lResistance, theory:isSafePb, theory:isSafeLR}
+	{theory:riskFun, theory:nFL, theory:dimlessLoad, theory:sdfTol, theory:probBr, theory:lResistance, theory:isSafePb, theory:isSafeLR}
 	}
 
 	instance:inputValues	[shape=box, color=black, style=filled, fillcolor=ivory, label="FR:inputValues"];
diff --git a/code/stable/glassbr/TraceyGraph/allvsr.dot b/code/stable/glassbr/TraceyGraph/allvsr.dot
index 59ae60f7515..7f3c4f8792f 100644
--- a/code/stable/glassbr/TraceyGraph/allvsr.dot
+++ b/code/stable/glassbr/TraceyGraph/allvsr.dot
@@ -25,11 +25,10 @@ digraph allvsr {
 	dataDefn:stdOffDist	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:standOffDist"];
 	dataDefn:aR	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:aspectRatio"];
 	dataDefn:eqTNTChar	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:eqTNTW"];
-	dataDefn:demandq	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:calofDemand"];
 
 	subgraph DD {
 	rank="same"
-	{dataDefn:minThick, dataDefn:loadDurFactor, dataDefn:glassTypeFac, dataDefn:stdOffDist, dataDefn:aR, dataDefn:eqTNTChar, dataDefn:demandq}
+	{dataDefn:minThick, dataDefn:loadDurFactor, dataDefn:glassTypeFac, dataDefn:stdOffDist, dataDefn:aR, dataDefn:eqTNTChar}
 	}
 
 	theory:isSafeProb	[shape=box, color=black, style=filled, fillcolor=pink, label="TM:isSafeProb"];
@@ -41,10 +40,8 @@ digraph allvsr {
 	}
 
 	theory:riskFun	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:riskFun"];
-	theory:stressDistFac	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:stressDistFac"];
 	theory:nFL	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:nFL"];
 	theory:dimlessLoad	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:dimlessLoad"];
-	theory:tolLoad	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:tolLoad"];
 	theory:sdfTol	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:sdfTol"];
 	theory:probBr	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:probOfBreak"];
 	theory:lResistance	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:calofCapacity"];
@@ -53,7 +50,7 @@ digraph allvsr {
 
 	subgraph IM {
 	rank="same"
-	{theory:riskFun, theory:stressDistFac, theory:nFL, theory:dimlessLoad, theory:tolLoad, theory:sdfTol, theory:probBr, theory:lResistance, theory:isSafePb, theory:isSafeLR}
+	{theory:riskFun, theory:nFL, theory:dimlessLoad, theory:sdfTol, theory:probBr, theory:lResistance, theory:isSafePb, theory:isSafeLR}
 	}
 
 	instance:inputValues	[shape=box, color=black, style=filled, fillcolor=ivory, label="FR:inputValues"];
diff --git a/code/stable/glassbr/TraceyGraph/avsall.dot b/code/stable/glassbr/TraceyGraph/avsall.dot
index 6c73aa6091e..b73ad7e9184 100644
--- a/code/stable/glassbr/TraceyGraph/avsall.dot
+++ b/code/stable/glassbr/TraceyGraph/avsall.dot
@@ -33,11 +33,10 @@ digraph avsall {
 	dataDefn:stdOffDist	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:standOffDist"];
 	dataDefn:aR	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:aspectRatio"];
 	dataDefn:eqTNTChar	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:eqTNTW"];
-	dataDefn:demandq	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:calofDemand"];
 
 	subgraph DD {
 	rank="same"
-	{dataDefn:minThick, dataDefn:loadDurFactor, dataDefn:glassTypeFac, dataDefn:stdOffDist, dataDefn:aR, dataDefn:eqTNTChar, dataDefn:demandq}
+	{dataDefn:minThick, dataDefn:loadDurFactor, dataDefn:glassTypeFac, dataDefn:stdOffDist, dataDefn:aR, dataDefn:eqTNTChar}
 	}
 
 	theory:isSafeProb	[shape=box, color=black, style=filled, fillcolor=pink, label="TM:isSafeProb"];
@@ -49,10 +48,8 @@ digraph avsall {
 	}
 
 	theory:riskFun	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:riskFun"];
-	theory:stressDistFac	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:stressDistFac"];
 	theory:nFL	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:nFL"];
 	theory:dimlessLoad	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:dimlessLoad"];
-	theory:tolLoad	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:tolLoad"];
 	theory:sdfTol	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:sdfTol"];
 	theory:probBr	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:probOfBreak"];
 	theory:lResistance	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:calofCapacity"];
@@ -61,7 +58,7 @@ digraph avsall {
 
 	subgraph IM {
 	rank="same"
-	{theory:riskFun, theory:stressDistFac, theory:nFL, theory:dimlessLoad, theory:tolLoad, theory:sdfTol, theory:probBr, theory:lResistance, theory:isSafePb, theory:isSafeLR}
+	{theory:riskFun, theory:nFL, theory:dimlessLoad, theory:sdfTol, theory:probBr, theory:lResistance, theory:isSafePb, theory:isSafeLR}
 	}
 
 	instance:inputValues	[shape=box, color=black, style=filled, fillcolor=ivory, label="FR:inputValues"];
diff --git a/code/stable/glassbr/TraceyGraph/refvsref.dot b/code/stable/glassbr/TraceyGraph/refvsref.dot
index 7fdd2952c14..80354d86d17 100644
--- a/code/stable/glassbr/TraceyGraph/refvsref.dot
+++ b/code/stable/glassbr/TraceyGraph/refvsref.dot
@@ -1,18 +1,9 @@
 digraph refvsref {
-	dataDefn:demandq -> dataDefn:stdOffDist;
-	dataDefn:demandq -> dataDefn:eqTNTChar;
 	theory:riskFun -> dataDefn:minThick;
 	theory:riskFun -> dataDefn:loadDurFactor;
-	theory:riskFun -> theory:stressDistFac;
-	theory:stressDistFac -> dataDefn:aR;
-	theory:stressDistFac -> theory:dimlessLoad;
 	theory:nFL -> dataDefn:minThick;
-	theory:nFL -> theory:tolLoad;
 	theory:dimlessLoad -> dataDefn:minThick;
 	theory:dimlessLoad -> dataDefn:glassTypeFac;
-	theory:dimlessLoad -> dataDefn:demandq;
-	theory:tolLoad -> dataDefn:aR;
-	theory:tolLoad -> theory:sdfTol;
 	theory:sdfTol -> dataDefn:minThick;
 	theory:sdfTol -> dataDefn:loadDurFactor;
 	theory:probBr -> theory:riskFun;
@@ -20,7 +11,6 @@ digraph refvsref {
 	theory:lResistance -> theory:nFL;
 	theory:isSafePb -> theory:probBr;
 	theory:isSafePb -> theory:isSafeLR;
-	theory:isSafeLR -> dataDefn:demandq;
 	theory:isSafeLR -> theory:lResistance;
 	theory:isSafeLR -> theory:isSafePb;
 
@@ -31,11 +21,10 @@ digraph refvsref {
 	dataDefn:stdOffDist	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:standOffDist"];
 	dataDefn:aR	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:aspectRatio"];
 	dataDefn:eqTNTChar	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:eqTNTW"];
-	dataDefn:demandq	[shape=box, color=black, style=filled, fillcolor=paleturquoise1, label="DD:calofDemand"];
 
 	subgraph DD {
 	rank="same"
-	{dataDefn:minThick, dataDefn:loadDurFactor, dataDefn:glassTypeFac, dataDefn:stdOffDist, dataDefn:aR, dataDefn:eqTNTChar, dataDefn:demandq}
+	{dataDefn:minThick, dataDefn:loadDurFactor, dataDefn:glassTypeFac, dataDefn:stdOffDist, dataDefn:aR, dataDefn:eqTNTChar}
 	}
 
 	theory:isSafeProb	[shape=box, color=black, style=filled, fillcolor=pink, label="TM:isSafeProb"];
@@ -47,10 +36,8 @@ digraph refvsref {
 	}
 
 	theory:riskFun	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:riskFun"];
-	theory:stressDistFac	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:stressDistFac"];
 	theory:nFL	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:nFL"];
 	theory:dimlessLoad	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:dimlessLoad"];
-	theory:tolLoad	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:tolLoad"];
 	theory:sdfTol	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:sdfTol"];
 	theory:probBr	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:probOfBreak"];
 	theory:lResistance	[shape=box, color=black, style=filled, fillcolor=khaki1, label="IM:calofCapacity"];
@@ -59,7 +46,7 @@ digraph refvsref {
 
 	subgraph IM {
 	rank="same"
-	{theory:riskFun, theory:stressDistFac, theory:nFL, theory:dimlessLoad, theory:tolLoad, theory:sdfTol, theory:probBr, theory:lResistance, theory:isSafePb, theory:isSafeLR}
+	{theory:riskFun, theory:nFL, theory:dimlessLoad, theory:sdfTol, theory:probBr, theory:lResistance, theory:isSafePb, theory:isSafeLR}
 	}
 
 }
diff --git a/code/stable/glassbr/src/cpp/Calculations.cpp b/code/stable/glassbr/src/cpp/Calculations.cpp
index 5ab10fa664f..b6181fdbb70 100644
--- a/code/stable/glassbr/src/cpp/Calculations.cpp
+++ b/code/stable/glassbr/src/cpp/Calculations.cpp
@@ -65,34 +65,34 @@ double func_q_hat_tol(InputParameters &inParams, double J_tol) {
     return interpY("SDF.txt", inParams.AR, J_tol);
 }
 
-double func_J(InputParameters &inParams, double q_hat) {
+double func_NFL(InputParameters &inParams, double q_hat_tol) {
     ofstream outfile;
     outfile.open("log.txt", std::fstream::app);
-    outfile << "function func_J called with inputs: {" << std::endl;
+    outfile << "function func_NFL called with inputs: {" << std::endl;
     outfile << "  inParams = ";
     outfile << "Instance of InputParameters object";
     outfile << ", " << std::endl;
-    outfile << "  q_hat = ";
-    outfile << q_hat << std::endl;
+    outfile << "  q_hat_tol = ";
+    outfile << q_hat_tol << std::endl;
     outfile << "  }" << std::endl;
     outfile.close();
     
-    return interpZ("SDF.txt", inParams.AR, q_hat);
+    return q_hat_tol * 7.17e10 * pow(inParams.h, 4.0) / pow(inParams.a * inParams.b, 2.0);
 }
 
-double func_NFL(InputParameters &inParams, double q_hat_tol) {
+double func_J(InputParameters &inParams, double q_hat) {
     ofstream outfile;
     outfile.open("log.txt", std::fstream::app);
-    outfile << "function func_NFL called with inputs: {" << std::endl;
+    outfile << "function func_J called with inputs: {" << std::endl;
     outfile << "  inParams = ";
     outfile << "Instance of InputParameters object";
     outfile << ", " << std::endl;
-    outfile << "  q_hat_tol = ";
-    outfile << q_hat_tol << std::endl;
+    outfile << "  q_hat = ";
+    outfile << q_hat << std::endl;
     outfile << "  }" << std::endl;
     outfile.close();
     
-    return q_hat_tol * 7.17e10 * pow(inParams.h, 4.0) / pow(inParams.a * inParams.b, 2.0);
+    return interpZ("SDF.txt", inParams.AR, q_hat);
 }
 
 double func_B(InputParameters &inParams, double J) {
diff --git a/code/stable/glassbr/src/cpp/Calculations.hpp b/code/stable/glassbr/src/cpp/Calculations.hpp
index 33f24cdd647..24592785ce1 100644
--- a/code/stable/glassbr/src/cpp/Calculations.hpp
+++ b/code/stable/glassbr/src/cpp/Calculations.hpp
@@ -40,13 +40,6 @@ double func_q_hat(InputParameters &inParams, double q);
 */
 double func_q_hat_tol(InputParameters &inParams, double J_tol);
 
-/** \brief Calculates stress distribution factor (Function)
-    \param inParams structure holding the input values
-    \param q_hat dimensionless load
-    \return stress distribution factor (Function)
-*/
-double func_J(InputParameters &inParams, double q_hat);
-
 /** \brief Calculates non-factored load (Pa)
     \param inParams structure holding the input values
     \param q_hat_tol tolerable load
@@ -54,6 +47,13 @@ double func_J(InputParameters &inParams, double q_hat);
 */
 double func_NFL(InputParameters &inParams, double q_hat_tol);
 
+/** \brief Calculates stress distribution factor (Function)
+    \param inParams structure holding the input values
+    \param q_hat dimensionless load
+    \return stress distribution factor (Function)
+*/
+double func_J(InputParameters &inParams, double q_hat);
+
 /** \brief Calculates risk of failure
     \param inParams structure holding the input values
     \param J stress distribution factor (Function)
diff --git a/code/stable/glassbr/src/cpp/Control.cpp b/code/stable/glassbr/src/cpp/Control.cpp
index 932d626e5f7..915710cecb2 100644
--- a/code/stable/glassbr/src/cpp/Control.cpp
+++ b/code/stable/glassbr/src/cpp/Control.cpp
@@ -53,18 +53,18 @@ int main(int argc, const char *argv[]) {
     outfile << q_hat_tol;
     outfile << " in module Control" << std::endl;
     outfile.close();
-    double J = func_J(inParams, q_hat);
-    outfile.open("log.txt", std::fstream::app);
-    outfile << "var 'J' assigned ";
-    outfile << J;
-    outfile << " in module Control" << std::endl;
-    outfile.close();
     double NFL = func_NFL(inParams, q_hat_tol);
     outfile.open("log.txt", std::fstream::app);
     outfile << "var 'NFL' assigned ";
     outfile << NFL;
     outfile << " in module Control" << std::endl;
     outfile.close();
+    double J = func_J(inParams, q_hat);
+    outfile.open("log.txt", std::fstream::app);
+    outfile << "var 'J' assigned ";
+    outfile << J;
+    outfile << " in module Control" << std::endl;
+    outfile.close();
     double B = func_B(inParams, J);
     outfile.open("log.txt", std::fstream::app);
     outfile << "var 'B' assigned ";
diff --git a/code/stable/glassbr/src/csharp/Calculations.cs b/code/stable/glassbr/src/csharp/Calculations.cs
index 7560c4d5ddb..41b705ee826 100644
--- a/code/stable/glassbr/src/csharp/Calculations.cs
+++ b/code/stable/glassbr/src/csharp/Calculations.cs
@@ -81,44 +81,44 @@ public static double func_q_hat_tol(InputParameters inParams, double J_tol) {
         return Interpolation.interpY("SDF.txt", inParams.AR, J_tol);
     }
     
-    /** \brief Calculates stress distribution factor (Function)
+    /** \brief Calculates non-factored load (Pa)
         \param inParams structure holding the input values
-        \param q_hat dimensionless load
-        \return stress distribution factor (Function)
+        \param q_hat_tol tolerable load
+        \return non-factored load (Pa)
     */
-    public static double func_J(InputParameters inParams, double q_hat) {
+    public static double func_NFL(InputParameters inParams, double q_hat_tol) {
         StreamWriter outfile;
         outfile = new StreamWriter("log.txt", true);
-        outfile.WriteLine("function func_J called with inputs: {");
+        outfile.WriteLine("function func_NFL called with inputs: {");
         outfile.Write("  inParams = ");
         outfile.Write("Instance of InputParameters object");
         outfile.WriteLine(", ");
-        outfile.Write("  q_hat = ");
-        outfile.WriteLine(q_hat);
+        outfile.Write("  q_hat_tol = ");
+        outfile.WriteLine(q_hat_tol);
         outfile.WriteLine("  }");
         outfile.Close();
         
-        return Interpolation.interpZ("SDF.txt", inParams.AR, q_hat);
+        return q_hat_tol * 7.17e10 * Math.Pow(inParams.h, 4.0) / Math.Pow(inParams.a * inParams.b, 2.0);
     }
     
-    /** \brief Calculates non-factored load (Pa)
+    /** \brief Calculates stress distribution factor (Function)
         \param inParams structure holding the input values
-        \param q_hat_tol tolerable load
-        \return non-factored load (Pa)
+        \param q_hat dimensionless load
+        \return stress distribution factor (Function)
     */
-    public static double func_NFL(InputParameters inParams, double q_hat_tol) {
+    public static double func_J(InputParameters inParams, double q_hat) {
         StreamWriter outfile;
         outfile = new StreamWriter("log.txt", true);
-        outfile.WriteLine("function func_NFL called with inputs: {");
+        outfile.WriteLine("function func_J called with inputs: {");
         outfile.Write("  inParams = ");
         outfile.Write("Instance of InputParameters object");
         outfile.WriteLine(", ");
-        outfile.Write("  q_hat_tol = ");
-        outfile.WriteLine(q_hat_tol);
+        outfile.Write("  q_hat = ");
+        outfile.WriteLine(q_hat);
         outfile.WriteLine("  }");
         outfile.Close();
         
-        return q_hat_tol * 7.17e10 * Math.Pow(inParams.h, 4.0) / Math.Pow(inParams.a * inParams.b, 2.0);
+        return Interpolation.interpZ("SDF.txt", inParams.AR, q_hat);
     }
     
     /** \brief Calculates risk of failure
diff --git a/code/stable/glassbr/src/csharp/Control.cs b/code/stable/glassbr/src/csharp/Control.cs
index 328cff9e88a..37335cb75f2 100644
--- a/code/stable/glassbr/src/csharp/Control.cs
+++ b/code/stable/glassbr/src/csharp/Control.cs
@@ -45,18 +45,18 @@ public static void Main(string[] args) {
         outfile.Write(q_hat_tol);
         outfile.WriteLine(" in module Control");
         outfile.Close();
-        double J = Calculations.func_J(inParams, q_hat);
-        outfile = new StreamWriter("log.txt", true);
-        outfile.Write("var 'J' assigned ");
-        outfile.Write(J);
-        outfile.WriteLine(" in module Control");
-        outfile.Close();
         double NFL = Calculations.func_NFL(inParams, q_hat_tol);
         outfile = new StreamWriter("log.txt", true);
         outfile.Write("var 'NFL' assigned ");
         outfile.Write(NFL);
         outfile.WriteLine(" in module Control");
         outfile.Close();
+        double J = Calculations.func_J(inParams, q_hat);
+        outfile = new StreamWriter("log.txt", true);
+        outfile.Write("var 'J' assigned ");
+        outfile.Write(J);
+        outfile.WriteLine(" in module Control");
+        outfile.Close();
         double B = Calculations.func_B(inParams, J);
         outfile = new StreamWriter("log.txt", true);
         outfile.Write("var 'B' assigned ");
diff --git a/code/stable/glassbr/src/java/GlassBR/Calculations.java b/code/stable/glassbr/src/java/GlassBR/Calculations.java
index 28965f49f4b..f6d32810a71 100644
--- a/code/stable/glassbr/src/java/GlassBR/Calculations.java
+++ b/code/stable/glassbr/src/java/GlassBR/Calculations.java
@@ -86,44 +86,44 @@ public static double func_q_hat_tol(InputParameters inParams, double J_tol) thro
         return Interpolation.interpY("SDF.txt", inParams.AR, J_tol);
     }
     
-    /** \brief Calculates stress distribution factor (Function)
+    /** \brief Calculates non-factored load (Pa)
         \param inParams structure holding the input values
-        \param q_hat dimensionless load
-        \return stress distribution factor (Function)
+        \param q_hat_tol tolerable load
+        \return non-factored load (Pa)
     */
-    public static double func_J(InputParameters inParams, double q_hat) throws Exception, FileNotFoundException, IOException {
+    public static double func_NFL(InputParameters inParams, double q_hat_tol) throws IOException {
         PrintWriter outfile;
         outfile = new PrintWriter(new FileWriter(new File("log.txt"), true));
-        outfile.println("function func_J called with inputs: {");
+        outfile.println("function func_NFL called with inputs: {");
         outfile.print("  inParams = ");
         outfile.print("Instance of InputParameters object");
         outfile.println(", ");
-        outfile.print("  q_hat = ");
-        outfile.println(q_hat);
+        outfile.print("  q_hat_tol = ");
+        outfile.println(q_hat_tol);
         outfile.println("  }");
         outfile.close();
         
-        return Interpolation.interpZ("SDF.txt", inParams.AR, q_hat);
+        return q_hat_tol * 7.17e10 * Math.pow(inParams.h, 4.0) / Math.pow(inParams.a * inParams.b, 2.0);
     }
     
-    /** \brief Calculates non-factored load (Pa)
+    /** \brief Calculates stress distribution factor (Function)
         \param inParams structure holding the input values
-        \param q_hat_tol tolerable load
-        \return non-factored load (Pa)
+        \param q_hat dimensionless load
+        \return stress distribution factor (Function)
     */
-    public static double func_NFL(InputParameters inParams, double q_hat_tol) throws IOException {
+    public static double func_J(InputParameters inParams, double q_hat) throws Exception, FileNotFoundException, IOException {
         PrintWriter outfile;
         outfile = new PrintWriter(new FileWriter(new File("log.txt"), true));
-        outfile.println("function func_NFL called with inputs: {");
+        outfile.println("function func_J called with inputs: {");
         outfile.print("  inParams = ");
         outfile.print("Instance of InputParameters object");
         outfile.println(", ");
-        outfile.print("  q_hat_tol = ");
-        outfile.println(q_hat_tol);
+        outfile.print("  q_hat = ");
+        outfile.println(q_hat);
         outfile.println("  }");
         outfile.close();
         
-        return q_hat_tol * 7.17e10 * Math.pow(inParams.h, 4.0) / Math.pow(inParams.a * inParams.b, 2.0);
+        return Interpolation.interpZ("SDF.txt", inParams.AR, q_hat);
     }
     
     /** \brief Calculates risk of failure
diff --git a/code/stable/glassbr/src/java/GlassBR/Control.java b/code/stable/glassbr/src/java/GlassBR/Control.java
index 0c6a33f7907..3cd089cc19d 100644
--- a/code/stable/glassbr/src/java/GlassBR/Control.java
+++ b/code/stable/glassbr/src/java/GlassBR/Control.java
@@ -50,18 +50,18 @@ public static void main(String[] args) throws Exception, FileNotFoundException,
         outfile.print(q_hat_tol);
         outfile.println(" in module Control");
         outfile.close();
-        double J = Calculations.func_J(inParams, q_hat);
-        outfile = new PrintWriter(new FileWriter(new File("log.txt"), true));
-        outfile.print("var 'J' assigned ");
-        outfile.print(J);
-        outfile.println(" in module Control");
-        outfile.close();
         double NFL = Calculations.func_NFL(inParams, q_hat_tol);
         outfile = new PrintWriter(new FileWriter(new File("log.txt"), true));
         outfile.print("var 'NFL' assigned ");
         outfile.print(NFL);
         outfile.println(" in module Control");
         outfile.close();
+        double J = Calculations.func_J(inParams, q_hat);
+        outfile = new PrintWriter(new FileWriter(new File("log.txt"), true));
+        outfile.print("var 'J' assigned ");
+        outfile.print(J);
+        outfile.println(" in module Control");
+        outfile.close();
         double B = Calculations.func_B(inParams, J);
         outfile = new PrintWriter(new FileWriter(new File("log.txt"), true));
         outfile.print("var 'B' assigned ");
diff --git a/code/stable/glassbr/src/python/Calculations.py b/code/stable/glassbr/src/python/Calculations.py
index 797d185fb7f..9b19b7cb1ce 100644
--- a/code/stable/glassbr/src/python/Calculations.py
+++ b/code/stable/glassbr/src/python/Calculations.py
@@ -67,39 +67,39 @@ def func_q_hat_tol(inParams, J_tol):
     
     return Interpolation.interpY("SDF.txt", inParams.AR, J_tol)
 
-## \brief Calculates stress distribution factor (Function)
+## \brief Calculates non-factored load (Pa)
 # \param inParams structure holding the input values
-# \param q_hat dimensionless load
-# \return stress distribution factor (Function)
-def func_J(inParams, q_hat):
+# \param q_hat_tol tolerable load
+# \return non-factored load (Pa)
+def func_NFL(inParams, q_hat_tol):
     outfile = open("log.txt", "a")
-    print("function func_J called with inputs: {", file=outfile)
+    print("function func_NFL called with inputs: {", file=outfile)
     print("  inParams = ", end="", file=outfile)
     print("Instance of InputParameters object", end="", file=outfile)
     print(", ", file=outfile)
-    print("  q_hat = ", end="", file=outfile)
-    print(q_hat, file=outfile)
+    print("  q_hat_tol = ", end="", file=outfile)
+    print(q_hat_tol, file=outfile)
     print("  }", file=outfile)
     outfile.close()
     
-    return Interpolation.interpZ("SDF.txt", inParams.AR, q_hat)
+    return q_hat_tol * 7.17e10 * inParams.h ** 4.0 / (inParams.a * inParams.b) ** 2.0
 
-## \brief Calculates non-factored load (Pa)
+## \brief Calculates stress distribution factor (Function)
 # \param inParams structure holding the input values
-# \param q_hat_tol tolerable load
-# \return non-factored load (Pa)
-def func_NFL(inParams, q_hat_tol):
+# \param q_hat dimensionless load
+# \return stress distribution factor (Function)
+def func_J(inParams, q_hat):
     outfile = open("log.txt", "a")
-    print("function func_NFL called with inputs: {", file=outfile)
+    print("function func_J called with inputs: {", file=outfile)
     print("  inParams = ", end="", file=outfile)
     print("Instance of InputParameters object", end="", file=outfile)
     print(", ", file=outfile)
-    print("  q_hat_tol = ", end="", file=outfile)
-    print(q_hat_tol, file=outfile)
+    print("  q_hat = ", end="", file=outfile)
+    print(q_hat, file=outfile)
     print("  }", file=outfile)
     outfile.close()
     
-    return q_hat_tol * 7.17e10 * inParams.h ** 4.0 / (inParams.a * inParams.b) ** 2.0
+    return Interpolation.interpZ("SDF.txt", inParams.AR, q_hat)
 
 ## \brief Calculates risk of failure
 # \param inParams structure holding the input values
diff --git a/code/stable/glassbr/src/python/Control.py b/code/stable/glassbr/src/python/Control.py
index 6c7054ffdbc..92d3ff80a06 100644
--- a/code/stable/glassbr/src/python/Control.py
+++ b/code/stable/glassbr/src/python/Control.py
@@ -40,18 +40,18 @@
 print(q_hat_tol, end="", file=outfile)
 print(" in module Control", file=outfile)
 outfile.close()
-J = Calculations.func_J(inParams, q_hat)
-outfile = open("log.txt", "a")
-print("var 'J' assigned ", end="", file=outfile)
-print(J, end="", file=outfile)
-print(" in module Control", file=outfile)
-outfile.close()
 NFL = Calculations.func_NFL(inParams, q_hat_tol)
 outfile = open("log.txt", "a")
 print("var 'NFL' assigned ", end="", file=outfile)
 print(NFL, end="", file=outfile)
 print(" in module Control", file=outfile)
 outfile.close()
+J = Calculations.func_J(inParams, q_hat)
+outfile = open("log.txt", "a")
+print("var 'J' assigned ", end="", file=outfile)
+print(J, end="", file=outfile)
+print(" in module Control", file=outfile)
+outfile.close()
 B = Calculations.func_B(inParams, J)
 outfile = open("log.txt", "a")
 print("var 'B' assigned ", end="", file=outfile)
diff --git a/code/stable/glassbr/src/swift/Calculations.swift b/code/stable/glassbr/src/swift/Calculations.swift
index 81aaadd9229..2fcc75d22bb 100644
--- a/code/stable/glassbr/src/swift/Calculations.swift
+++ b/code/stable/glassbr/src/swift/Calculations.swift
@@ -216,12 +216,12 @@ func func_q_hat_tol(_ inParams: inout InputParameters, _ J_tol: Double) throws -
     return try interpY("SDF.txt", inParams.AR, J_tol)
 }
 
-/** Calculates stress distribution factor (Function)
+/** Calculates non-factored load (Pa)
     - Parameter inParams: structure holding the input values
-    - Parameter q_hat: dimensionless load
-    - Returns: stress distribution factor (Function)
+    - Parameter q_hat_tol: tolerable load
+    - Returns: non-factored load (Pa)
 */
-func func_J(_ inParams: inout InputParameters, _ q_hat: Double) throws -> Double {
+func func_NFL(_ inParams: inout InputParameters, _ q_hat_tol: Double) throws -> Double {
     var outfile: FileHandle
     do {
         outfile = try FileHandle(forWritingTo: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("log.txt"))
@@ -230,7 +230,7 @@ func func_J(_ inParams: inout InputParameters, _ q_hat: Double) throws -> Double
         throw "Error opening file."
     }
     do {
-        try outfile.write(contentsOf: Data("function func_J called with inputs: {".utf8))
+        try outfile.write(contentsOf: Data("function func_NFL called with inputs: {".utf8))
         try outfile.write(contentsOf: Data("\n".utf8))
     } catch {
         throw "Error printing to file."
@@ -252,12 +252,12 @@ func func_J(_ inParams: inout InputParameters, _ q_hat: Double) throws -> Double
         throw "Error printing to file."
     }
     do {
-        try outfile.write(contentsOf: Data("  q_hat = ".utf8))
+        try outfile.write(contentsOf: Data("  q_hat_tol = ".utf8))
     } catch {
         throw "Error printing to file."
     }
     do {
-        try outfile.write(contentsOf: Data(String(q_hat).utf8))
+        try outfile.write(contentsOf: Data(String(q_hat_tol).utf8))
         try outfile.write(contentsOf: Data("\n".utf8))
     } catch {
         throw "Error printing to file."
@@ -274,15 +274,15 @@ func func_J(_ inParams: inout InputParameters, _ q_hat: Double) throws -> Double
         throw "Error closing file."
     }
     
-    return try interpZ("SDF.txt", inParams.AR, q_hat)
+    return q_hat_tol * 7.17e10 * pow(inParams.h, 4.0) / pow(inParams.a * inParams.b, 2.0)
 }
 
-/** Calculates non-factored load (Pa)
+/** Calculates stress distribution factor (Function)
     - Parameter inParams: structure holding the input values
-    - Parameter q_hat_tol: tolerable load
-    - Returns: non-factored load (Pa)
+    - Parameter q_hat: dimensionless load
+    - Returns: stress distribution factor (Function)
 */
-func func_NFL(_ inParams: inout InputParameters, _ q_hat_tol: Double) throws -> Double {
+func func_J(_ inParams: inout InputParameters, _ q_hat: Double) throws -> Double {
     var outfile: FileHandle
     do {
         outfile = try FileHandle(forWritingTo: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("log.txt"))
@@ -291,7 +291,7 @@ func func_NFL(_ inParams: inout InputParameters, _ q_hat_tol: Double) throws ->
         throw "Error opening file."
     }
     do {
-        try outfile.write(contentsOf: Data("function func_NFL called with inputs: {".utf8))
+        try outfile.write(contentsOf: Data("function func_J called with inputs: {".utf8))
         try outfile.write(contentsOf: Data("\n".utf8))
     } catch {
         throw "Error printing to file."
@@ -313,12 +313,12 @@ func func_NFL(_ inParams: inout InputParameters, _ q_hat_tol: Double) throws ->
         throw "Error printing to file."
     }
     do {
-        try outfile.write(contentsOf: Data("  q_hat_tol = ".utf8))
+        try outfile.write(contentsOf: Data("  q_hat = ".utf8))
     } catch {
         throw "Error printing to file."
     }
     do {
-        try outfile.write(contentsOf: Data(String(q_hat_tol).utf8))
+        try outfile.write(contentsOf: Data(String(q_hat).utf8))
         try outfile.write(contentsOf: Data("\n".utf8))
     } catch {
         throw "Error printing to file."
@@ -335,7 +335,7 @@ func func_NFL(_ inParams: inout InputParameters, _ q_hat_tol: Double) throws ->
         throw "Error closing file."
     }
     
-    return q_hat_tol * 7.17e10 * pow(inParams.h, 4.0) / pow(inParams.a * inParams.b, 2.0)
+    return try interpZ("SDF.txt", inParams.AR, q_hat)
 }
 
 /** Calculates risk of failure
diff --git a/code/stable/glassbr/src/swift/main.swift b/code/stable/glassbr/src/swift/main.swift
index 151d51d00b0..65ede1bf81c 100644
--- a/code/stable/glassbr/src/swift/main.swift
+++ b/code/stable/glassbr/src/swift/main.swift
@@ -150,7 +150,7 @@ do {
 } catch {
     throw "Error closing file."
 }
-var J: Double = try func_J(&inParams, q_hat)
+var NFL: Double = try func_NFL(&inParams, q_hat_tol)
 do {
     outfile = try FileHandle(forWritingTo: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("log.txt"))
     try outfile.seekToEnd()
@@ -158,12 +158,12 @@ do {
     throw "Error opening file."
 }
 do {
-    try outfile.write(contentsOf: Data("var 'J' assigned ".utf8))
+    try outfile.write(contentsOf: Data("var 'NFL' assigned ".utf8))
 } catch {
     throw "Error printing to file."
 }
 do {
-    try outfile.write(contentsOf: Data(String(J).utf8))
+    try outfile.write(contentsOf: Data(String(NFL).utf8))
 } catch {
     throw "Error printing to file."
 }
@@ -178,7 +178,7 @@ do {
 } catch {
     throw "Error closing file."
 }
-var NFL: Double = try func_NFL(&inParams, q_hat_tol)
+var J: Double = try func_J(&inParams, q_hat)
 do {
     outfile = try FileHandle(forWritingTo: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("log.txt"))
     try outfile.seekToEnd()
@@ -186,12 +186,12 @@ do {
     throw "Error opening file."
 }
 do {
-    try outfile.write(contentsOf: Data("var 'NFL' assigned ".utf8))
+    try outfile.write(contentsOf: Data("var 'J' assigned ".utf8))
 } catch {
     throw "Error printing to file."
 }
 do {
-    try outfile.write(contentsOf: Data(String(NFL).utf8))
+    try outfile.write(contentsOf: Data(String(J).utf8))
 } catch {
     throw "Error printing to file."
 }