diff --git a/LSL2/STPROC/TEST_RUN_SERVICES.txt b/LSL2/STPROC/TEST_RUN_SERVICES.txt
index 466781c..d1bf7fd 100644
--- a/LSL2/STPROC/TEST_RUN_SERVICES.txt
+++ b/LSL2/STPROC/TEST_RUN_SERVICES.txt
@@ -321,22 +321,25 @@ Service CreateTestRunRecord(RunTypeID, EqpType, EqpID, PSNo, RDSNo, UserID, TWLo
     TWRunKey     = ''
     Response     = ''
     ErrorMessage = ''
+    TWTrackingSystemActive = Database_Services('ReadDataColumn', 'APP_INFO', 'NEW_TW_SYSTEM_ACTIVE_SWITCH', 1, True$, 0, False$)
     //Pre-Checks.
-    If TWLotIds NE '' then
-        for each TWLotId in TWLotIds using @VM setting twLotPos
-            ThisTWLotCurrQty = Database_Services('ReadDataColumn', 'LOT', TWLotId, LOT_WAFER_QTY$, True$, 0, False$)
-            If ThisTWLotCurrQty then
-                ThisTWLotUsageQty = TWLotQtys<1, twLotPos>
-                If ThisTWLotCurrQty LT ThisTWLotUsageQty then
-                    ErrorMessage = 'Error in Create Test Run Record routine. Lot # ' : TWLotId : ' does not have enough wafers. Please choose ' : ThisTWLotCurrQty : ' wafers or less.'
-                end
-            end else
-                ErrorMessage = 'Error in Create Test Run Record routine. Lot # ' : TWLotId : ' has a zero wafer quantity.'
-            end
-        Until ErrorMessage NE ''
-        Next TWLotId
-    end else
-        ErrorMessage = 'Error in Create Test Run Record routine. No test wafer lots entered.'
+    If TWTrackingSystemActive then
+		If TWLotIds NE '' then
+			for each TWLotId in TWLotIds using @VM setting twLotPos
+				ThisTWLotCurrQty = Database_Services('ReadDataColumn', 'LOT', TWLotId, LOT_WAFER_QTY$, True$, 0, False$)
+				If ThisTWLotCurrQty then
+					ThisTWLotUsageQty = TWLotQtys<1, twLotPos>
+					If ThisTWLotCurrQty LT ThisTWLotUsageQty then
+						ErrorMessage = 'Error in Create Test Run Record routine. Lot # ' : TWLotId : ' does not have enough wafers. Please choose ' : ThisTWLotCurrQty : ' wafers or less.'
+					end
+				end else
+					ErrorMessage = 'Error in Create Test Run Record routine. Lot # ' : TWLotId : ' has a zero wafer quantity.'
+				end
+			Until ErrorMessage NE ''
+			Next TWLotId
+		end else
+			ErrorMessage = 'Error in Create Test Run Record routine. No test wafer lots entered.'
+		end
     end
     If ErrorMessage EQ '' then
         If RunTypeID NE '' AND EqpType NE '' AND EqpID NE '' AND UserID NE '' then
@@ -794,3 +797,4 @@ end service
 
 
 
+