diff --git a/LSL2/STPROC/NDW_ADJUST_LOT_QTY_EVENTS.txt b/LSL2/STPROC/NDW_ADJUST_LOT_QTY_EVENTS.txt
index dc88436..5692b52 100644
--- a/LSL2/STPROC/NDW_ADJUST_LOT_QTY_EVENTS.txt
+++ b/LSL2/STPROC/NDW_ADJUST_LOT_QTY_EVENTS.txt
@@ -3,7 +3,7 @@ Compile function NDW_ADJUST_LOT_QTY_EVENTS(CtrlEntId, Event, @PARAMS)
 #window NDW_ADJUST_LOT_QTY
 
 Declare function MemberOf, Database_Services, Error_Services, Datetime
-Declare subroutine PlaceDialog, Database_Services, Lot_Services, Lot_Event_Services
+Declare subroutine PlaceDialog, Database_Services, Lot_Services, Lot_Event_Services, Test_Run_Services
 $Insert App_Inserts
 $Insert Lot_Equates
 
@@ -107,6 +107,7 @@ Event PUB_SEARCH_LOT.CLICK()
 end event
 
 Event PUB_SUBMIT.CLICK()
+    
     LotId            = Get_Property(@Window : '.EDL_LOT_NO', 'TEXT')
     NewWfrQty        = Get_Property(@Window : '.EDL_NEW_LOT_WFR_QTY', 'TEXT')
     LotType          = Database_Services('ReadDataColumn', 'LOT', LotId, LOT_TYPE$, True$, 0, False$)
@@ -129,6 +130,8 @@ Event PUB_SUBMIT.CLICK()
                                 If Error_Services('NoError') then
                                     Lot_Event_Services('CreateLotEvent', LotId, Datetime(), 'COMMENT', 'Manual Lot Qty decrease performed.', '', @User4, '' , '')
                                 end
+                                PSNNo = Xlate('RDS', LotID, 'PROD_SPEC_ID', 'X')
+                                Test_Run_Services('CreateTestRunRecord', 13, '', '', PSNNo, '', @User4, LotID, NewWfrQty, True$)
                             Case NewWfrQty GT CurrWfrQty
                                 AmountToIncrease = NewWfrQty - CurrWfrQty
                                 Lot_Services('IncreaseLotWaferCount', LotId, AmountToIncrease, @User4)
@@ -137,10 +140,14 @@ Event PUB_SUBMIT.CLICK()
                                 end
                         End Case
                         If Error_Services('NoError') then
+                            Set_Property(@Window : '.EDL_CURR_WFR_QTY', 'TEXT', '')
+                            Set_Property(@Window : '.EDL_NEW_LOT_WFR_QTY', 'TEXT', '')
+                            Set_Property(@Window : '.EDL_LOT_NO', 'TEXT', '')
+                            Set_Property(@Window : '.PUB_SUBMIT', 'ENABLED', False$)
                             msg(@Window, 'Wafer quantity adjusted successfully!')
                             Result    = ''
                             Result<1> = True$
-                            End_Dialog(@Window, Result)
+*                            End_Dialog(@Window, Result)
                         end else
                             ErrorMessage = Error_Services('GetMessage')
                             msg(@Window, 'Error Adjusting wafer quantity, ' : ErrorMessage)
@@ -156,6 +163,7 @@ Event PUB_SUBMIT.CLICK()
     end else
        msg(@Window, 'Lot # ' : LotId : ' not found!') 
     end
+    
 end event
 
 Event PUB_CANCEL.CLICK()
@@ -183,3 +191,6 @@ return
 
 
 
+
+
+
diff --git a/LSL2/STPROC/TEST_RUN_SERVICES.txt b/LSL2/STPROC/TEST_RUN_SERVICES.txt
index eca5790..fc22458 100644
--- a/LSL2/STPROC/TEST_RUN_SERVICES.txt
+++ b/LSL2/STPROC/TEST_RUN_SERVICES.txt
@@ -331,13 +331,15 @@ Service GetTestWaferLots(ShowOnlyOpenLots)
     Response = TestWaferLotKeys
 end service
 
-Service CreateTestRunRecord(RunTypeID, EqpType, EqpID, PSNo, RDSNo, UserID, TWLotIds, TWLotQtys)
+Service CreateTestRunRecord(RunTypeID, EqpType, EqpID, PSNo, RDSNo, UserID, TWLotIds, TWLotQtys, ManualQtyAdjust)
+    
     StartTick = GetTickCount()
     MetricName = 'CreateTestRunRecord'
     
     TWRunKey     = ''
     Response     = ''
     ErrorMessage = ''
+    If ManualQtyAdjust EQ '' then ManualQtyAdjust = False$
     TWTrackingSystemActive = Database_Services('ReadDataColumn', 'APP_INFO', 'NEW_TW_SYSTEM_ACTIVE_SWITCH', 1, True$, 0, False$)
     //Pre-Checks.
     If TWTrackingSystemActive then
@@ -359,7 +361,7 @@ Service CreateTestRunRecord(RunTypeID, EqpType, EqpID, PSNo, RDSNo, UserID, TWLo
 		end
     end
     If ErrorMessage EQ '' then
-        If RunTypeID NE '' AND EqpType NE '' AND EqpID NE '' AND UserID NE '' then
+        If (RunTypeID NE '' AND UserID NE '' AND EqpType NE '' AND EqpID NE '') OR (RunTypeID NE '' AND UserID NE '' AND ManualQtyAdjust EQ True$) then
             RunDTM                             = SRP_Datetime('Now')
             TWRunRec                           = ''
             TWRunRec<TEST_RUN_RUN_DTM$>        = RunDTM
@@ -512,7 +514,6 @@ Service CreateTestRunRecord(RunTypeID, EqpType, EqpID, PSNo, RDSNo, UserID, TWLo
         Response      = ''
     end
     
-    
 end service
 
 Service CreateTestRunWaferRecord(TestRunID, TWPartID, TWUsageTypeID, SourceLotId, Username)
@@ -838,3 +839,5 @@ end service
 
 
 
+
+