diff --git a/LSL2/STPROC/RDS_EVENTS.txt b/LSL2/STPROC/RDS_EVENTS.txt
index 4872cc7..2e291d1 100644
--- a/LSL2/STPROC/RDS_EVENTS.txt
+++ b/LSL2/STPROC/RDS_EVENTS.txt
@@ -349,7 +349,6 @@ Event PUB_SIGN.CLICK()
 						Response    = Dialog_Box('NDW_VERIFY_USER', @WINDOW, initParams)
 						Valid       = Response<1>
 						If (Valid EQ True$) then
-						    debug
 						    if XLATE('APP_INFO', 'NEW_TW_SYSTEM_ACTIVE_SWITCH', 1, 'X') EQ True$ then
                                 UsingTestWafers = Msg(@Window, '', 'YESNO', '', 'Log Test Wafer Usage':@FM:'Are any test wafers loaded?')
                                 IsTWReqd        = RDS_Services('IsTWLoggingReqd', RDSNo)
@@ -716,3 +715,4 @@ return
 
 
 
+
diff --git a/LSL2/STPROC/RDS_SERVICES.txt b/LSL2/STPROC/RDS_SERVICES.txt
index 96f367c..b534b15 100644
--- a/LSL2/STPROC/RDS_SERVICES.txt
+++ b/LSL2/STPROC/RDS_SERVICES.txt
@@ -745,7 +745,7 @@ Service IsTWLoggingReqd(RDSNo)
     Response   = False$
     RDSRec     = Database_Services('ReadDataRow', 'RDS', RDSNo, True$, 0, False$)
     IsHGCVReqd = obj_RDS('MetPropFlag', RDSNo:@RM:RDSRec:@RM:'CRES')
-    If IsHGCVReqd NE True$ then
+    If IsHGCVReqd EQ True$ then
         ExistingTWKeys = Test_Run_Services('GetTestRunKeysByRDS', RDSNo)
         If ExistingTWKeys EQ '' then
             Response = True$
@@ -754,7 +754,7 @@ Service IsTWLoggingReqd(RDSNo)
         end
         
     end else
-        Response = True$
+        Response = False$
     end
     TWTrackingSystemActive = Database_Services('ReadDataColumn', 'APP_INFO', 'NEW_TW_SYSTEM_ACTIVE_SWITCH', 1, True$, 0, False$)
     If TWTrackingSystemActive EQ False$ then
@@ -1659,3 +1659,4 @@ ClearCursors:
 return
 
 
+
diff --git a/LSL2/STPROC/SCAN_SERVICES.txt b/LSL2/STPROC/SCAN_SERVICES.txt
index 7be61e3..b0115b3 100644
--- a/LSL2/STPROC/SCAN_SERVICES.txt
+++ b/LSL2/STPROC/SCAN_SERVICES.txt
@@ -894,7 +894,7 @@ Service ProcessScanData(ScanID, ScanJSON)
                                                                         If (FirstParmsComp EQ False$) then RDS_Services('CopyRDSLayerParameters', RDSNo)
                                                                         //Test Wafer logging verification
                                                                         IsTWLoggingReqd = RDS_Services('IsTWLoggingReqd', RDSNo)
-                                                                        If IsTWLoggingReqd EQ True$ AND TestWaferLotData NE '' then
+                                                                        If IsTWLoggingReqd NE True$ OR TestWaferLotData NE '' then
                                                                         
                                                                             // Supplier lot verification
                                                                             ScannedSuppLot = ScansRow<SCANS.SUPPLIER_LOT$>
@@ -965,7 +965,7 @@ Service ProcessScanData(ScanID, ScanJSON)
                                                             Case CurrStage _EQC 'LOAD'
                                                                 Action = 'LOAD'
                                                                 IsTWLoggingReqd = RDS_Services('IsTWLoggingReqd', RDSNo)
-                                                                If IsTWLoggingReqd EQ True$ AND TestWaferLotData NE '' then
+                                                                If IsTWLoggingReqd NE True$ OR TestWaferLotData NE '' then
                                                                     ScannedSuppLot = ScansRow<SCANS.SUPPLIER_LOT$>
                                                                     RDSSuppLot     = RDSRec<RDS_LOT_NUM$>
                                                                     If (ScannedSuppLot NE '') then
@@ -2255,3 +2255,4 @@ ClearCursors:
 return
 
 
+