diff --git a/LSL2/OIWIN/NDW_LOG_TEST_WAFER_USAGE.json b/LSL2/OIWIN/NDW_LOG_TEST_WAFER_USAGE.json
index 9a770de..77de595 100644
--- a/LSL2/OIWIN/NDW_LOG_TEST_WAFER_USAGE.json
+++ b/LSL2/OIWIN/NDW_LOG_TEST_WAFER_USAGE.json
@@ -2667,8 +2667,36 @@
                 },
                 "<14,16>": "",
                 "<14,17>": "",
-                "<14,18>": "",
-                "<14,19>": "",
+                "<14,18>": {
+                    "<14,18,1>": {
+                        "<14,18,1,1>": "X",
+                        "<14,18,1,2>": "EXECUTE",
+                        "<14,18,1,3>": "@WINDOW_EVENTS",
+                        "<14,18,1,4>": {
+                            "<14,18,1,4,1>": "@SELF",
+                            "<14,18,1,4,2>": "@EVENT",
+                            "<14,18,1,4,3>": "@PARAM1",
+                            "<14,18,1,4,4>": "@PARAM2",
+                            "<14,18,1,4,5>": "@PARAM3",
+                            "<14,18,1,4,6>": "@PARAM4",
+                            "<14,18,1,4,7>": "@PARAM5",
+                            "<14,18,1,4,8>": "@PARAM6"
+                        },
+                        "<14,18,1,5>": "",
+                        "<14,18,1,6>": "",
+                        "<14,18,1,7>": "",
+                        "<14,18,1,8>": "",
+                        "<14,18,1,9>": "",
+                        "<14,18,1,10>": "",
+                        "<14,18,1,11>": "",
+                        "<14,18,1,12>": "",
+                        "<14,18,1,13>": "",
+                        "<14,18,1,14>": "",
+                        "<14,18,1,15>": "COMMEVT",
+                        "<14,18,1,16>": "0"
+                    }
+                },
+                "<14,19>": "LOSTFOCUS",
                 "<14,20>": "",
                 "<14,21>": "",
                 "<14,22>": "",
@@ -2768,7 +2796,7 @@
                 "<15,3>": "PUSHBUTTON",
                 "<15,4>": "NDW_LOG_TEST_WAFER_USAGE",
                 "<15,5>": "324",
-                "<15,6>": "4",
+                "<15,6>": "7",
                 "<15,7>": "84",
                 "<15,8>": "32",
                 "<15,9>": "Add Lot",
diff --git a/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt b/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt
index e55fa09..96fd9b9 100644
--- a/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt
+++ b/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt
@@ -94,6 +94,33 @@ Event EDL_LOT_ID.LOSTFOCUS(Flag, FocusID)
     end
 end event
 
+Event EDL_RDS.LOSTFOCUS(Flag, FocusID)
+	RDSNo = Get_Property(@Window : '.EDL_RDS', 'TEXT')
+	If Len(RDSNo) GE 6 then
+		If RowExists('RDS', RDSNo) then
+			RDSRec    = Database_Services('ReadDataRow', 'RDS', RDSNo)
+			PSN       = RDSRec<RDS_PROD_SPEC_ID$>
+			ReactorNo = RDSRec<RDS_REACTOR$>
+			If PSN NE '' then
+				Set_Property(@Window : '.EDL_PSN', 'TEXT', PSN)
+				Set_Property(@Window : '.EDL_PSN', 'ENABLED', -1)
+			end
+			If ReactorNo NE '' then
+				Set_Property(@Window : '.CMB_EQUIP_TYPE', 'VALUE', 'Reactor')
+				Set_Property(@Window : '.CMB_EQUIP_TYPE', 'ENABLED', -1)
+				Set_Property(@Window : '.CMB_EQUIPMENT_ID', 'TEXT', ReactorNo)
+				Set_Property(@Window : '.CMB_EQUIPMENT_ID', 'ENABLED', -1)
+			end
+		end
+	end else
+		Set_Property(@Window : '.EDL_PSN', 'TEXT', '')
+		Set_Property(@Window : '.EDL_PSN', 'ENABLED', True$)
+		Set_Property(@Window : '.CMB_EQUIPMENT_ID', 'TEXT', '')
+		Set_Property(@Window : '.CMB_EQUIPMENT_ID', 'ENABLED', True$)
+		Set_Property(@Window : '.CMB_EQUIP_TYPE', 'ENABLED', True$)
+	end
+end event
+
 Event PUB_ADD_LOT.CLICK()
     TWLotUseArray  = Get_Property(@Window: '.EDT_TW_USAGE', 'LIST')
     LotId          = Get_Property(@Window : '.EDL_LOT_ID', 'TEXT')
@@ -277,8 +304,13 @@ Return
 ClearFormData:
     Set_Property(@Window : '.EDL_LOT_ID', 'TEXT', '')
     Set_Property(@Window : '.EDL_RDS', 'TEXT', '')
+    
     Set_Property(@Window : '.EDL_PSN', 'TEXT', '')
+    Set_Property(@Window : '.EDL_PSN', 'ENABLED', True$)
+    Set_Property(@Window : '.CMB_EQUIP_TYPE', 'TEXT', '')
+    Set_Property(@Window : '.CMB_EQUIP_TYPE', 'ENABLED', True$)
     Set_Property(@Window : '.CMB_EQUIPMENT_ID', 'TEXT', '')
+    Set_Property(@Window : '.CMB_EQUIPMENT_ID', 'ENABLED', True$)
     Set_Property(@Window : 'CMB_TEST_TYPE', 'TEXT', '')
     Set_Property(@Window : '.EDT_TW_USAGE', 'LIST', '')
 return
@@ -286,3 +318,4 @@ return
 
 
 
+