diff --git a/LSL2/STPROC/PRINT_SAP_CASS_SHIP_LABEL.txt b/LSL2/STPROC/PRINT_SAP_CASS_SHIP_LABEL.txt
index e8c136d..d763628 100644
--- a/LSL2/STPROC/PRINT_SAP_CASS_SHIP_LABEL.txt
+++ b/LSL2/STPROC/PRINT_SAP_CASS_SHIP_LABEL.txt
@@ -515,15 +515,15 @@ FOR I = 1 TO CassCnt
 	END
 
 	GOSUB PrintLabel
-    PrintSpectrumLabel = False$
-    EpiPartNo          = XLATE('WO_LOG', WONo, WO_LOG_EPI_PART_NO$, 'X')
-    CustReshipPartNo	= XLATE('WO_MAT', WONo : '*' : CassNo, WO_MAT_RESHIP_CUST_EPI_PART_NO$, 'X')
+    PrintSpectrumLabel    = False$
+    EpiPartNo             = XLATE('WO_LOG', WONo, WO_LOG_EPI_PART_NO$, 'X')
+    CustReshipPartNo      = XLATE('WO_MAT', WONo : '*' : CassNo, WO_MAT_RESHIP_CUST_EPI_PART_NO$, 'X')
     If CustReshipPartNo EQ '' then
-    	ZPVMMatNum         = XLATE('EPI_PART', EpiPartNo, EPI_PART_VARM_PART_NO$, 'X')
+    	GenerateSpectrumLabel = XLATE('EPI_PART', EpiPartNo, EPI_PART_GENERATE_SPECTRUM_LABEL$, 'X')
     end else
-    	ZPVMMatNum         = XLATE('EPI_PART', CustReshipPartNo, EPI_PART_VARM_PART_NO$, 'X')
+        GenerateSpectrumLabel = XLATE('EPI_PART', CustReshipPartNo, EPI_PART_GENERATE_SPECTRUM_LABEL$, 'X')
     end
-    PrintSpectrumLabel = ZPVMMatNum NE '' AND (Indexc(PrintPath, 'MESZBRPRT011', 1) OR Indexc(PrintPath, 'MESZBRPRT004', 1))
+    PrintSpectrumLabel = GenerateSpectrumLabel AND (Indexc(PrintPath, 'MESZBRPRT011', 1) OR Indexc(PrintPath, 'MESZBRPRT004', 1))
     If PrintSpectrumLabel then
         Sap_Services('PrintSpectrumLabel', WONo, WOStep, CassNo)
         If Error_Services('NoError') then
@@ -741,3 +741,4 @@ RETURN
 
 
 
+
diff --git a/LSL2/STPROC/SAP_SERVICES.txt b/LSL2/STPROC/SAP_SERVICES.txt
index 7a1a97a..3046dc8 100644
--- a/LSL2/STPROC/SAP_SERVICES.txt
+++ b/LSL2/STPROC/SAP_SERVICES.txt
@@ -655,12 +655,19 @@ Service PrintSpectrumLabel(WONo,StepNo,CassNo)
             EpiPartNo          = XLATE('WO_LOG', WOLogKey, WO_LOG_EPI_PART_NO$, 'X')
             ReshipEpiPartNo		= XLATE('WO_MAT', WoMatKey, WO_MAT_RESHIP_CUST_EPI_PART_NO$, 'X')
             IF ReshipEpiPartNo EQ '' then
-            	ZPVMMatNum         = XLATE('EPI_PART', EpiPartNo, EPI_PART_VARM_PART_NO$, 'X')
-				ZPVMPartDesc       = XLATE('EPI_PART', EpiPartNo, EPI_PART_EPI_PART_DESC$ , 'X')
+                EpiPartToUse = EpiPartNo
             end else
-            	ZPVMMatNum         = XLATE('EPI_PART', ReshipEpiPartNo, EPI_PART_VARM_PART_NO$, 'X')
-				ZPVMPartDesc       = XLATE('EPI_PART', ReshipEpiPartNo, EPI_PART_EPI_PART_DESC$ , 'X')
+                EpiPartToUse = ReshipEpiPartNo
             end
+            ZPVMMatNum = XLATE('EPI_PART', EpiPartToUse, EPI_PART_VARM_PART_NO$, 'X')
+            If ZPVMMatNum EQ '' then
+                ZPVMMatNum = EpiPartToUse
+            end
+            ZPVMPartDesc = XLATE('EPI_PART', EpiPartToUse, EPI_PART_VARM_DESCRIPTION$ , 'X')
+            If ZPVMPartDesc EQ '' then
+                ZPVMPartDesc = XLATE('EPI_PART', EpiPartToUse, EPI_PART_EPI_PART_DESC$ , 'X')
+            end
+            
             ShipDate           = XLATE('WO_MAT', WoMatKey, WO_MAT_SAP_TX_DTM$, 'X')
             ShipYear           = SRP_Datetime('Year', ShipDate)
             ShipYear           = ShipYear[3,4]
@@ -679,7 +686,7 @@ Service PrintSpectrumLabel(WONo,StepNo,CassNo)
 				SikData<SIK_M_QUANTITY$>      = 'M_QUANTITY' : Tab$ : CurrWaferCnt
 				SikData<SIK_M_QUANTITY1$>     = 'M_QUANTITY1' : Tab$ : CurrWaferCnt
 				SikData<SIK_M_LOTNO$>         = 'M_LOTNO' : Tab$ : SAPBatchNo
-				SikData<SIK_DATECODE$>        = 'M_DATECODE' : Tab$ : ShipDtCd; *Need to send a datecode in format of YYWW, so need to find a way to generate a correct work week. Something already exists I'm sure
+				SikData<SIK_DATECODE$>        = 'M_DATECODE' : Tab$ : ShipDtCd
 				SikData<SIK_LOTCOUNT$>        = 'LOTCOUNT' : Tab$ : 1; *Default
 				SikData<SIK_SERIALNO$>        = 'SERIALNO' : Tab$ : 00001; *Default
 				SikData<SIK_M_CODE$>          = 'M_COD' : Tab$ : 'US'; *Default
@@ -689,7 +696,7 @@ Service PrintSpectrumLabel(WONo,StepNo,CassNo)
 				SikData<SIK_BLANK_LINE$>      = '';*Intentionally left blank. Example file has a blank line here.
 				SikData<SIK_FIXED_DATA_2$>    = 'EXECUTE EBSOFTLD.SYSTEM PRINT'
 				SikData<SIK_LABEL_ID$>        = 'LABEL_ID' : Tab$ : 'BPL_CYSC'; *Default
-				SikData<SIK_PRT_PORT$>        = 'PRT_PORT' : Tab$ : 'MESOPCNOVP604LBL003'; *This is the printer. This will change once a permanent printer is assigned to us.
+				SikData<SIK_PRT_PORT$>        = 'PRT_PORT' : Tab$ : 'MESOPCNOVP604LBL003';
 				swap @FM with CRLF$ in SikData
 				Status() = 0
 				OSWrite SikData to SpectrumExportPath
@@ -1025,3 +1032,4 @@ ClearCursors:
     
 return
 
+