diff --git a/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt b/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt
index cf50db8..5dd0495 100644
--- a/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt
+++ b/LSL2/STPROC/NDW_LOG_TEST_WAFER_USAGE_EVENTS.txt
@@ -3,7 +3,8 @@ Compile function NDW_LOG_TEST_WAFER_USAGE_EVENTS(CtrlEntId, Event, @PARAMS)
 #window NDW_LOG_TEST_WAFER_USAGE
 
 Declare function    Get_Property, Error_Services, Test_Run_Services, Reactor_Services, Tool_Services, Database_Services, Lot_Services
-Declare subroutine  Set_Property, Error_Services, Msg, End_Dialog, Lot_Services, PlaceDialog
+declare function    UCASE
+Declare subroutine  Set_Property, Error_Services, Msg, End_Dialog, Lot_Services, PlaceDialog, NDW_LOG_TEST_WAFER_USAGE_EVENTS
 
 $Insert APP_INSERTS
 $Insert TEST_RUN_EQUATES
@@ -41,7 +42,9 @@ Event WINDOW.CREATE(CreateParam)
         RDSNo               = CreateParam<1, 1>
         PresetTestType      = CreateParam<1, 2>
         PresetEquipmentType = CreateParam<1, 3>
-        PresetEquipmentId   = CreateParam<1, 4>
+        PresetEquipmentId   = CreateParam<1, 4>  
+    end else
+        Set_Property(@Window, '@KeepWindowOpen', True$)
     end
     If RDSNo NE '' AND RowExists('RDS', RDSNo) then
         PSN = XLATE('RDS', RDSNo, RDS_PROD_SPEC_ID$, 'X')
@@ -87,10 +90,16 @@ Event Window.CLOSE(CancelFlag, CloseFlags)
 end event
 
 Event EDL_LOT_ID.LOSTFOCUS(Flag, FocusID)
-    LotIdString = Get_Property(@Window : '.EDL_LOT_ID', 'TEXT')
-    If LotIdString[1, 4] EQ '1TTW' then
-        Set_Property(@Window : '.EDL_LOT_ID', 'TEXT', LotIdString[3, 999])
+    LotIdString = UCASE(Get_Property(@Window : '.EDL_LOT_ID', 'TEXT'))
+    If LotIdString NE '' then
+        If LotIdString[1, 4] EQ '1TTW' then
+        LotIdString = LotIdString[3, 999]
+        Set_Property(@Window : '.EDL_LOT_ID', 'TEXT', LotIdString)
+        end
+        NDW_LOG_TEST_WAFER_USAGE_EVENTS(@Window : '.PUB_ADD_LOT', 'CLICK')
+        Set_Property(@Window : '.EDL_LOT_ID', 'FOCUS', True$)
     end
+    
 end event
 
 Event EDL_RDS.LOSTFOCUS(Flag, FocusID)
@@ -176,8 +185,9 @@ Event PUB_ADD_LOT.CLICK()
         end else
            Msg(@Window, 'Error: Lot ':LotId:' already exists in the list.')
            Set_Property(@Window : '.EDL_LOT_ID', 'TEXT', '')
-        end        
+        end
     end
+    
 end event
 
 Event EDT_TW_USAGE.ROWSELCHANGED(SelRow, SelState)
@@ -259,7 +269,13 @@ Event PUB_SUBMIT.CLICK()
 				Msg(@Window, 'Test Run Created Successfully!')
 				Result    = ''
 				Result<1> = True$
-                End_Dialog(@Window, Result)
+				KeepWindowOpen = Get_Property(@Window, '@KeepWindowOpen')
+				If KeepWindowOpen then
+				    GoSub ClearFormData
+				end else
+				    End_Dialog(@Window, Result)
+				end
+                
 			end else
 			    ErrorMessage = Error_Services('GetMessage')
 			    Msg(@Window, 'Error! - ' : ErrorMessage)
@@ -319,3 +335,4 @@ return
 
 
 
+
diff --git a/LSL2/STPROC/NDW_MAIN_EVENTS.txt b/LSL2/STPROC/NDW_MAIN_EVENTS.txt
index 127575c..0c016fe 100644
--- a/LSL2/STPROC/NDW_MAIN_EVENTS.txt
+++ b/LSL2/STPROC/NDW_MAIN_EVENTS.txt
@@ -674,7 +674,7 @@ end event
 
 Event OLE_LOG_TEST_RUN.OnClick(Point, Button, Shift, Ctrl)
     
-    rv  = Start_Window('NDW_TEST_RUN', '')
+    rv  = Start_Window('NDW_LOG_TEST_WAFER_USAGE', '')
     
 end event
 
@@ -849,3 +849,4 @@ FixFont:
         
 return
 
+