diff --git a/LSL2/OIWIN/NDW_MAKEUP_WAFERS.json b/LSL2/OIWIN/NDW_MAKEUP_WAFERS.json
index c406898..9c0387d 100644
--- a/LSL2/OIWIN/NDW_MAKEUP_WAFERS.json
+++ b/LSL2/OIWIN/NDW_MAKEUP_WAFERS.json
@@ -18,7 +18,7 @@
                 "<1,5>": "95",
                 "<1,6>": "179",
                 "<1,7>": "-793",
-                "<1,8>": "-309",
+                "<1,8>": "-313",
                 "<1,9>": "Makeup Wafers",
                 "<1,10>": {
                     "<1,10,1>": "0x84C80000",
@@ -197,7 +197,7 @@
                 "<1,3>": "OLECONTROL.SRP.ReportTable.1",
                 "<1,4>": "NDW_MAKEUP_WAFERS",
                 "<1,5>": "10",
-                "<1,6>": "249",
+                "<1,6>": "267",
                 "<1,7>": "-107",
                 "<1,8>": "47",
                 "<1,9>": "SRP.ReportTable.1",
@@ -334,7 +334,7 @@
                 "<2,3>": "OLECONTROL.SRP.Picture.1",
                 "<2,4>": "NDW_MAKEUP_WAFERS",
                 "<2,5>": "10",
-                "<2,6>": "233",
+                "<2,6>": "251",
                 "<2,7>": "-107",
                 "<2,8>": "14",
                 "<2,9>": "SRP.Picture.1",
@@ -391,7 +391,7 @@
                 "<2,33>": "",
                 "<2,34>": "",
                 "<2,35>": "",
-                "<2,36>": "05000000000000000000000032000000FFFEFF044E006F006E006500FFFEFF0341006C006C00FFFEFF044E006F006E006500FFFEFF0744006900760069006400650072000100000001000000FFFEFF0B430065006E00740065007200FEF04C00650066007400FFFEFF00FFFEFF0443006C0069007000FFFEFF044100750074006F00FFFEFF2F55006E0061007600610069006C00610062006C006500200057006100660065007200730020002D002000570061006900740069006E00670020006F006E0020005000610063006B006100670069006E00670020004C006100620065006C00FFFEFF044E006F006E006500FFFEFF225300650067006F006500200055004900FCF02D0031003100FCF0370030003000FCF03000FCF03000FCF03000FCF03100FCF03000FCF03000FCF03000FCF03000FCF03000000000000000F03FFFFEFF0B430065006E00740065007200FEF04C00650066007400F7FFFFFF00000000000000000000000001000000",
+                "<2,36>": "05000000000000000000000032000000FFFEFF044E006F006E006500FFFEFF0341006C006C00FFFEFF044E006F006E006500FFFEFF0744006900760069006400650072000100000001000000FFFEFF0B430065006E00740065007200FEF04C00650066007400FFFEFF00FFFEFF0443006C0069007000FFFEFF044100750074006F00FFFEFF2F55006E0061007600610069006C00610062006C006500200057006100660065007200730020002D002000570061006900740069006E00670020006F006E00200046005100410020004C006100620065006C00200043006800650063006B00FFFEFF044E006F006E006500FFFEFF225300650067006F006500200055004900FCF02D0031003100FCF0370030003000FCF03000FCF03000FCF03000FCF03100FCF03000FCF03000FCF03000FCF03000FCF03000000000000000F03FFFFEFF0B430065006E00740065007200FEF04C00650066007400F7FFFFFF00000000000000000000000001000000",
                 "<2,37>": "",
                 "<2,38>": "",
                 "<2,39>": "",
@@ -448,7 +448,7 @@
                     "<2,56,4>": "None",
                     "<2,56,5>": "All",
                     "<2,56,6>": "None",
-                    "<2,56,7>": "Unavailable Wafers - Waiting on Packaging Label",
+                    "<2,56,7>": "Unavailable Wafers - Waiting on FQA Label Check",
                     "<2,56,8>": "None",
                     "<2,56,9>": "Left",
                     "<2,56,10>": "-9",
diff --git a/LSL2/STPROC/MATERIAL_SERVICES.txt b/LSL2/STPROC/MATERIAL_SERVICES.txt
index fbe0f26..e6396cd 100644
--- a/LSL2/STPROC/MATERIAL_SERVICES.txt
+++ b/LSL2/STPROC/MATERIAL_SERVICES.txt
@@ -705,7 +705,6 @@ Service GetAvailableMakeupWafers(WorkOrderNo, KeysOnly=BOOLEAN)
 												ActiveStatus = XLATE('PROD_SPEC', ProdSpecID, PROD_SPEC_STATUS$, 'X')
 												LabelCheck = Count(WOMatRow<WO_MAT_INV_ACTION$>, 'LBLCHK')
 												// JRO Added the extra condition for Active Status 5/8/2020
-												debug
 												If ActiveStatus EQ 'A' then
 													Begin Case
 														
@@ -1484,3 +1483,4 @@ ClearCursors:
 return
 
 
+
diff --git a/LSL2/STPROC/NDW_MAKEUP_WAFERS_EVENTS.txt b/LSL2/STPROC/NDW_MAKEUP_WAFERS_EVENTS.txt
index 2a29035..fe3fa90 100644
--- a/LSL2/STPROC/NDW_MAKEUP_WAFERS_EVENTS.txt
+++ b/LSL2/STPROC/NDW_MAKEUP_WAFERS_EVENTS.txt
@@ -85,20 +85,58 @@ Event WINDOW.CREATE(CreateParam)
     MsgUp = Msg(@Window, MsgDef)
     
     MakeupWafers    = Material_Services('GetAvailableMakeupWafers', ThisWorkOrderNo, False$)
-    debug
+   
 	// Remove cassette being backfilled from available list
-	MakeupWafersClean = ''
-	NumMUCass         = DCount(MakeupWafers, @VM)
+	AvailMuCass = ''
+	NoFQAMuCass = ''
+	NoBatchMuCass = ''
+	NoLabelMuCass = ''
 	
-	If NumMUCass GT 0 then
-		For CassIndex = 1 to NumMUCass
-			Row        = MakeupWafers<0, CassIndex>
-			MuWoMatKey = Row<0, 0, 1> : '*' : Row<0, 0, 2>
-			If (MuWoMatKey NE ThisWOMatKey) then MakeupWafersClean<0, -1> = Row
-		Next CassIndex
+	If MakeupWafers<1> NE '' then
+	    For each Row in  MakeupWafers<1> using @VM setting RowPos
+	        MuWoMatKey = Row<0, 0, 1> : '*' : Row<0, 0, 2>
+			If (MuWoMatKey NE ThisWOMatKey) then AvailMuCass<0, -1> = Row
+	    Next Row
 	end
-
-	MakeupWafers = MakeupWafersClean
+	
+	If MakeupWafers<2> NE '' then
+	    For each Row in MakeupWafers<2> using @VM setting RowPos
+	        MuWoMatKey = Row<0, 0, 1> : '*' : Row<0, 0, 2>
+			If (MuWoMatKey NE ThisWOMatKey) then NoFQAMuCass<0, -1> = Row
+	    Next Row
+	end
+	
+	If MakeupWafers<3> NE '' then
+	    For each Row in MakeupWafers<3> using @VM setting RowPos
+	        MuWoMatKey = Row<0, 0, 1> : '*' : Row<0, 0, 2>
+			If (MuWoMatKey NE ThisWOMatKey) then NoBatchMuCass<0, -1> = Row
+	    Next Row
+	end
+	
+	If MakeupWafers<4> NE '' then
+	    For each Row in  MakeupWafers<4> using @VM setting RowPos
+	        MuWoMatKey = Row<0, 0, 1> : '*' : Row<0, 0, 2>
+			If (MuWoMatKey NE ThisWOMatKey) then NoLabelMuCass<0, -1> = Row
+	    Next Row
+	end
+	
+	MakeupWafers<1> = AvailMuCass
+	MakeupWafers<2> = NoFQAMuCass
+	MakeupWafers<3> = NoBatchMuCass
+	MakeupWafers<4> = NoLabelMuCass
+	
+*	MakeupWafersClean = ''
+*	NumMUCass         = DCount(MakeupWafers, @VM)
+*	
+*	If NumMUCass GT 0 then
+*		For CassIndex = 1 to NumMUCass
+*			Row        = MakeupWafers<0, CassIndex>
+*			MuWoMatKey = Row<0, 0, 1> : '*' : Row<0, 0, 2>
+*			If (MuWoMatKey NE ThisWOMatKey) then MakeupWafersClean<0, -1> = Row
+*		Next CassIndex
+*	end
+*
+*	MakeupWafers = MakeupWafersClean
 
     Msg(@Window, MsgUp)
     
@@ -203,7 +241,7 @@ Setup_OLE_Controls:
     Set_Property(RptUnsignedCtrl, 'OLE.ColumnList', ColumnList)
     Set_Property(RptNoBatchCtrl, 'OLE.ColumnList', ColumnList)
     Set_Property(RptNoLabelCtrl, 'OLE.ColumnList', ColumnList)
-    debug
+    
     SignedWafers   = ''
     UnsignedWafers = ''
     NoBatchWafers  = ''