Resolve "Depreciate use of Version 4 and 5.0 Draglibs"

18 files changed, 74 insertions, 74 deletions

diff --git a/Dragon/data/trowland_proc/mox_1c_case1.c2m b/Dragon/data/trowland_proc/mox_1c_case1.c2m
index 964004c..7a375e8 100644
--- a/Dragon/data/trowland_proc/mox_1c_case1.c2m
+++ b/Dragon/data/trowland_proc/mox_1c_case1.c2m
@@ -54,7 +54,7 @@ LIBRARY := LIB: ::
 LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ;
 CP := ASM: LIBRARY TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.211783 ;
+assertS FLUX :: K-EFFECTIVE 1 1.211813 ;
 LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ;
 *----
 * USS
@@ -89,7 +89,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.214894 ;
+assertS FLUX :: K-EFFECTIVE 1 1.215058 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -124,7 +124,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.214438 ;
+assertS FLUX :: K-EFFECTIVE 1 1.214667 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -159,7 +159,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.216819 ;
+assertS FLUX :: K-EFFECTIVE 1 1.217064 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test mox_1c_case1 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/mox_1c_case2.c2m b/Dragon/data/trowland_proc/mox_1c_case2.c2m
index 5dbe2da..c3af459 100644
--- a/Dragon/data/trowland_proc/mox_1c_case2.c2m
+++ b/Dragon/data/trowland_proc/mox_1c_case2.c2m
@@ -54,7 +54,7 @@ LIBRARY := LIB: ::
 LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ;
 CP := ASM: LIBRARY TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.196600 ;
+assertS FLUX :: K-EFFECTIVE 1 1.196639 ;
 LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ;
 *----
 * USS
@@ -89,7 +89,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.200151 ;
+assertS FLUX :: K-EFFECTIVE 1 1.200324 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -124,7 +124,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.199719 ;
+assertS FLUX :: K-EFFECTIVE 1 1.200026 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -160,7 +160,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.202332 ;
+assertS FLUX :: K-EFFECTIVE 1 1.202691 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test mox_1c_case2 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/mox_1c_case3.c2m b/Dragon/data/trowland_proc/mox_1c_case3.c2m
index 5000db5..e765b67 100644
--- a/Dragon/data/trowland_proc/mox_1c_case3.c2m
+++ b/Dragon/data/trowland_proc/mox_1c_case3.c2m
@@ -54,7 +54,7 @@ LIBRARY := LIB: ::
 LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ;
 CP := ASM: LIBRARY TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.254774 ;
+assertS FLUX :: K-EFFECTIVE 1 1.254805 ;
 LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ;
 *----
 * USS
@@ -89,7 +89,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.257776 ;
+assertS FLUX :: K-EFFECTIVE 1 1.257941 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -124,7 +124,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.257338 ;
+assertS FLUX :: K-EFFECTIVE 1 1.257563 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -161,7 +161,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.259420 ;
+assertS FLUX :: K-EFFECTIVE 1 1.259668 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test mox_1c_case3 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/mox_1c_case4.c2m b/Dragon/data/trowland_proc/mox_1c_case4.c2m
index 4ed936e..e25088a 100644
--- a/Dragon/data/trowland_proc/mox_1c_case4.c2m
+++ b/Dragon/data/trowland_proc/mox_1c_case4.c2m
@@ -55,7 +55,7 @@ LIBRARY := LIB: ::
 LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ;
 CP := ASM: LIBRARY TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.240108 ;
+assertS FLUX :: K-EFFECTIVE 1 1.240151 ;
 LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ;
 *----
 * USS
@@ -91,7 +91,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.243575 ;
+assertS FLUX :: K-EFFECTIVE 1 1.243747 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -127,7 +127,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.243140 ;
+assertS FLUX :: K-EFFECTIVE 1 1.243456 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -163,7 +163,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.245390 ;
+assertS FLUX :: K-EFFECTIVE 1 1.245764 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test mox_1c_case4 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/mox_6c_case1.c2m b/Dragon/data/trowland_proc/mox_6c_case1.c2m
index b0cff3f..6c7c029 100644
--- a/Dragon/data/trowland_proc/mox_6c_case1.c2m
+++ b/Dragon/data/trowland_proc/mox_6c_case1.c2m
@@ -68,7 +68,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.212406 ;
+assertS FLUX :: K-EFFECTIVE 1 1.212435 ;
 LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 *----
 * SHI LEVEL 2
@@ -76,7 +76,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.217351 ;
+assertS FLUX :: K-EFFECTIVE 1 1.217428 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * USS
@@ -117,7 +117,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.216483 ;
+assertS FLUX :: K-EFFECTIVE 1 1.216626 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -158,7 +158,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.216640 ;
+assertS FLUX :: K-EFFECTIVE 1 1.216878 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -199,7 +199,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.219029 ;
+assertS FLUX :: K-EFFECTIVE 1 1.219295 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test mox_6c_case1 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/mox_6c_case2.c2m b/Dragon/data/trowland_proc/mox_6c_case2.c2m
index 29dffc0..91811db 100644
--- a/Dragon/data/trowland_proc/mox_6c_case2.c2m
+++ b/Dragon/data/trowland_proc/mox_6c_case2.c2m
@@ -68,7 +68,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.196737 ;
+assertS FLUX :: K-EFFECTIVE 1 1.196778 ;
 LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 *----
 * SHI LEVEL 2
@@ -76,7 +76,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.202921 ;
+assertS FLUX :: K-EFFECTIVE 1 1.202990 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * USS
@@ -117,7 +117,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.201930 ;
+assertS FLUX :: K-EFFECTIVE 1 1.202079 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -158,7 +158,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.202230 ;
+assertS FLUX :: K-EFFECTIVE 1 1.202529 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -199,7 +199,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.204836 ;
+assertS FLUX :: K-EFFECTIVE 1 1.205209 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test mox_6c_case2 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/mox_6c_case3.c2m b/Dragon/data/trowland_proc/mox_6c_case3.c2m
index a339190..9ea4b11 100644
--- a/Dragon/data/trowland_proc/mox_6c_case3.c2m
+++ b/Dragon/data/trowland_proc/mox_6c_case3.c2m
@@ -68,7 +68,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.255316 ;
+assertS FLUX :: K-EFFECTIVE 1 1.255384 ;
 LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 *----
 * SHI LEVEL 2
@@ -76,7 +76,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.260489 ;
+assertS FLUX :: K-EFFECTIVE 1 1.260530 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * USS
@@ -117,7 +117,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.259171 ;
+assertS FLUX :: K-EFFECTIVE 1 1.259336 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -158,7 +158,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.259364 ;
+assertS FLUX :: K-EFFECTIVE 1 1.259616 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -199,7 +199,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.261451 ;
+assertS FLUX :: K-EFFECTIVE 1 1.261735 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test mox_6c_case3 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/mox_6c_case4.c2m b/Dragon/data/trowland_proc/mox_6c_case4.c2m
index 92edf56..20fbf8b 100644
--- a/Dragon/data/trowland_proc/mox_6c_case4.c2m
+++ b/Dragon/data/trowland_proc/mox_6c_case4.c2m
@@ -68,7 +68,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.240057 ;
+assertS FLUX :: K-EFFECTIVE 1 1.240102 ;
 LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 *----
 * SHI LEVEL 2
@@ -76,7 +76,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.246576 ;
+assertS FLUX :: K-EFFECTIVE 1 1.246666 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * USS
@@ -117,7 +117,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.245146 ;
+assertS FLUX :: K-EFFECTIVE 1 1.245318 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -158,7 +158,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.245467 ;
+assertS FLUX :: K-EFFECTIVE 1 1.245798 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -199,7 +199,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.247720 ;
+assertS FLUX :: K-EFFECTIVE 1 1.248117 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test mox_6c_case4 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/mox_6c_case5.c2m b/Dragon/data/trowland_proc/mox_6c_case5.c2m
index b3b9ef1..8d7b136 100644
--- a/Dragon/data/trowland_proc/mox_6c_case5.c2m
+++ b/Dragon/data/trowland_proc/mox_6c_case5.c2m
@@ -114,6 +114,6 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 5 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: EDIT 1 PIJ ;
 CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ;
-assertS CALC :: K-EFFECTIVE 1 1.209962 ;
+assertS CALC :: K-EFFECTIVE 1 1.202269 ;
 ECHO "test mox_6c_case5 completed" ;
 QUIT "LIST" .
diff --git a/Dragon/data/trowland_proc/uo2_1c_case1.c2m b/Dragon/data/trowland_proc/uo2_1c_case1.c2m
index b6d78c6..a0d4186 100644
--- a/Dragon/data/trowland_proc/uo2_1c_case1.c2m
+++ b/Dragon/data/trowland_proc/uo2_1c_case1.c2m
@@ -46,7 +46,7 @@ LIBRARY := LIB: ::
 LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ;
 CP := ASM: LIBRARY TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.383546 ;
+assertS FLUX :: K-EFFECTIVE 1 1.383528 ;
 LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ;
 *----
 * USS
@@ -75,7 +75,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.386392 ;
+assertS FLUX :: K-EFFECTIVE 1 1.386455 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -104,7 +104,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.385827 ;
+assertS FLUX :: K-EFFECTIVE 1 1.386297 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -133,7 +133,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.385731 ;
+assertS FLUX :: K-EFFECTIVE 1 1.385866 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test uo2_1c_case1 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/uo2_1c_case2.c2m b/Dragon/data/trowland_proc/uo2_1c_case2.c2m
index 45ad2eb..462a407 100644
--- a/Dragon/data/trowland_proc/uo2_1c_case2.c2m
+++ b/Dragon/data/trowland_proc/uo2_1c_case2.c2m
@@ -46,7 +46,7 @@ LIBRARY := LIB: ::
 LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ;
 CP := ASM: LIBRARY TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.330381 ;
+assertS FLUX :: K-EFFECTIVE 1 1.330351 ;
 LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ;
 *----
 * USS
@@ -75,7 +75,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.333523 ;
+assertS FLUX :: K-EFFECTIVE 1 1.333658 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -104,7 +104,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.332833 ;
+assertS FLUX :: K-EFFECTIVE 1 1.333404 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -133,7 +133,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.332671 ;
+assertS FLUX :: K-EFFECTIVE 1 1.332622 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test uo2_1c_case2 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/uo2_1c_case3.c2m b/Dragon/data/trowland_proc/uo2_1c_case3.c2m
index 63a5bd3..0bc0a49 100644
--- a/Dragon/data/trowland_proc/uo2_1c_case3.c2m
+++ b/Dragon/data/trowland_proc/uo2_1c_case3.c2m
@@ -47,7 +47,7 @@ LIBRARY := LIB: ::
 LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ;
 CP := ASM: LIBRARY TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.296387 ;
+assertS FLUX :: K-EFFECTIVE 1 1.296384 ;
 LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ;
 *----
 * USS
@@ -77,7 +77,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.301136 ;
+assertS FLUX :: K-EFFECTIVE 1 1.301383 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -107,7 +107,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.300764 ;
+assertS FLUX :: K-EFFECTIVE 1 1.307834 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -137,7 +137,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.300509 ;
+assertS FLUX :: K-EFFECTIVE 1 1.308285 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test uo2_1c_case3 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/uo2_1c_case4.c2m b/Dragon/data/trowland_proc/uo2_1c_case4.c2m
index a491d90..90c3b6d 100644
--- a/Dragon/data/trowland_proc/uo2_1c_case4.c2m
+++ b/Dragon/data/trowland_proc/uo2_1c_case4.c2m
@@ -46,7 +46,7 @@ LIBRARY := LIB: ::
 LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ;
 CP := ASM: LIBRARY TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.310755 ;
+assertS FLUX :: K-EFFECTIVE 1 1.310745 ;
 LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ;
 *----
 * USS
@@ -75,7 +75,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.314775 ;
+assertS FLUX :: K-EFFECTIVE 1 1.314615 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -104,7 +104,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.313890 ;
+assertS FLUX :: K-EFFECTIVE 1 1.314164 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -133,7 +133,7 @@ LIBRARY2 := USS: LIBRARY TRACK ::
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK ::
 TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.313668 ;
+assertS FLUX :: K-EFFECTIVE 1 1.313385 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test uo2_1c_case4 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/uo2_6c_case1.c2m b/Dragon/data/trowland_proc/uo2_6c_case1.c2m
index b6829e3..75eaf1e 100644
--- a/Dragon/data/trowland_proc/uo2_6c_case1.c2m
+++ b/Dragon/data/trowland_proc/uo2_6c_case1.c2m
@@ -63,7 +63,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.386497 ;
+assertS FLUX :: K-EFFECTIVE 1 1.386467 ;
 LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 *----
 * SHI LEVEL 2
@@ -71,7 +71,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.389577 ;
+assertS FLUX :: K-EFFECTIVE 1 1.389604 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * USS
@@ -106,7 +106,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.387408 ;
+assertS FLUX :: K-EFFECTIVE 1 1.387462 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -141,7 +141,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.387702 ;
+assertS FLUX :: K-EFFECTIVE 1 1.388190 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -176,7 +176,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.387639 ;
+assertS FLUX :: K-EFFECTIVE 1 1.387964 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test uo2_6c_case1 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/uo2_6c_case2.c2m b/Dragon/data/trowland_proc/uo2_6c_case2.c2m
index dd80751..3ad6899 100644
--- a/Dragon/data/trowland_proc/uo2_6c_case2.c2m
+++ b/Dragon/data/trowland_proc/uo2_6c_case2.c2m
@@ -63,7 +63,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.334656 ;
+assertS FLUX :: K-EFFECTIVE 1 1.334615 ;
 LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 *----
 * SHI LEVEL 2
@@ -71,7 +71,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.337793 ;
+assertS FLUX :: K-EFFECTIVE 1 1.337805 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * USS
@@ -106,7 +106,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.334885 ;
+assertS FLUX :: K-EFFECTIVE 1 1.335009 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -141,7 +141,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.335035 ;
+assertS FLUX :: K-EFFECTIVE 1 1.335629 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -176,7 +176,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.334913 ;
+assertS FLUX :: K-EFFECTIVE 1 1.335166 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test uo2_6c_case2 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/uo2_6c_case3.c2m b/Dragon/data/trowland_proc/uo2_6c_case3.c2m
index 3cda0f1..72a9be6 100644
--- a/Dragon/data/trowland_proc/uo2_6c_case3.c2m
+++ b/Dragon/data/trowland_proc/uo2_6c_case3.c2m
@@ -63,7 +63,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.299005 ;
+assertS FLUX :: K-EFFECTIVE 1 1.299020 ;
 LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 *----
 * SHI LEVEL 2
@@ -71,7 +71,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.306005 ;
+assertS FLUX :: K-EFFECTIVE 1 1.305848 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * USS
@@ -106,7 +106,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.303040 ;
+assertS FLUX :: K-EFFECTIVE 1 1.303275 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -141,7 +141,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.303980 ;
+assertS FLUX :: K-EFFECTIVE 1 1.316244 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -176,7 +176,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.303796 ;
+assertS FLUX :: K-EFFECTIVE 1 1.316225 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test uo2_6c_case3 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/uo2_6c_case4.c2m b/Dragon/data/trowland_proc/uo2_6c_case4.c2m
index d57637e..8a41b46 100644
--- a/Dragon/data/trowland_proc/uo2_6c_case4.c2m
+++ b/Dragon/data/trowland_proc/uo2_6c_case4.c2m
@@ -63,7 +63,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.314095 ;
+assertS FLUX :: K-EFFECTIVE 1 1.314097 ;
 LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 *----
 * SHI LEVEL 2
@@ -71,7 +71,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ;
 LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.319513 ;
+assertS FLUX :: K-EFFECTIVE 1 1.319498 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * USS
@@ -106,7 +106,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.316421 ;
+assertS FLUX :: K-EFFECTIVE 1 1.316250 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended
@@ -141,7 +141,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.316549 ;
+assertS FLUX :: K-EFFECTIVE 1 1.316831 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 *----
 * Ribon extended with correlation
@@ -176,7 +176,7 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: PIJ ;
 FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ;
-assertS FLUX :: K-EFFECTIVE 1 1.316382 ;
+assertS FLUX :: K-EFFECTIVE 1 1.316412 ;
 LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ;
 ECHO "test uo2_6c_case4 completed" ;
 END: ;
diff --git a/Dragon/data/trowland_proc/uo2_6c_case5.c2m b/Dragon/data/trowland_proc/uo2_6c_case5.c2m
index 91ad0de..2ed562f 100644
--- a/Dragon/data/trowland_proc/uo2_6c_case5.c2m
+++ b/Dragon/data/trowland_proc/uo2_6c_case5.c2m
@@ -78,6 +78,6 @@ LIBRARY := LIB: ::
 LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 5 GRMIN 45 ;
 CP := ASM: LIBRARY2 TRACK :: EDIT 1 PIJ ;
 CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ;
-assertS CALC :: K-EFFECTIVE 1 1.320614 ;
+assertS CALC :: K-EFFECTIVE 1  1.306048 ;
 ECHO "test uo2_6c_case5 completed" ;
 QUIT "LIST" .