diff --git a/LSL2/STPROC/CLEAN_INSP_SERVICES.txt b/LSL2/STPROC/CLEAN_INSP_SERVICES.txt
index c7580aa..0e22860 100644
--- a/LSL2/STPROC/CLEAN_INSP_SERVICES.txt
+++ b/LSL2/STPROC/CLEAN_INSP_SERVICES.txt
@@ -454,7 +454,7 @@ Service GetLatestDefectCINoByRDSId(RDSNo)
         Btree.Extract(SrchString, 'CLEAN_INSP', @DICT, CIList, Option, Flag)
         If CIList NE '' then
             for each CleanInspKey in CIList using @VM
-                ThisCIInspDtm    = Database_Services('ReadDataColumn', 'CLEAN_INSP', CleanInspKey, CLEAN_INSP_SCAN_VER_SIG_DTM$ , True$, 0, False$)
+                ThisCIInspDtm    = Database_Services('ReadDataColumn', 'CLEAN_INSP', CleanInspKey, CLEAN_INSP_SCAN_SIG$ , True$, 0, False$)<1,1>
                 ThisCIInspDefAvg = Database_Services('ReadDataColumn', 'CLEAN_INSP', CleanInspKey, CLEAN_INSP_SCAN_SUM_OF_DEF_AVG$ , True$, 0, False$)
                 If ThisCIInspDtm GT LatestInspDtm AND ThisCIInspDefAvg NE '' then
                     LatestCINo    = CleanInspKey
@@ -469,3 +469,4 @@ end service
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Internal GoSubs
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
diff --git a/LSL2/STPROC/EXPORT_CDS.txt b/LSL2/STPROC/EXPORT_CDS.txt
index 907bc74..7ee1334 100644
--- a/LSL2/STPROC/EXPORT_CDS.txt
+++ b/LSL2/STPROC/EXPORT_CDS.txt
@@ -104,7 +104,6 @@ Result = ''
             InSlot     = WMOutRec<6,N>
 		    Line       = CassID : @VM : SlotNo : @VM : RDSNo : @VM : Pocket : @VM : Zone : @VM : LotNo : @VM : PartNo : @VM : CassNo : @VM : InSlot : @VM
 		    If CustNo EQ 7108 then
-		        
 		        //This is data specifically for EpiSil
 		        WOMatRec     = Database_Services('ReadDataRow', 'WO_MAT', WOMatKey, True$, 0, False$)
 		        SAPBatchNo   = WOMatRec<WO_MAT_SAP_BATCH_NO$>
@@ -158,9 +157,17 @@ Result = ''
 		        Line := Layer1ResRhoAvg : @VM : Layer2ResRhoAvg : @VM : Layer1ResRhoStdDev : @VM : Layer2ResRhoStdDev : @VM : Layer1ThkAvg : @VM : Layer2ThkAvg : @VM : LayerCombinedThkAvg : @VM
 		        LatestCIKey = Clean_Insp_Services('GetLatestDefectCINoByRDSId', RDSNo)
 		        ThisCleanInspRec = Database_Services('ReadDataRow', 'CLEAN_INSP', LatestCIKey, True$, 0, False$)
-		        DefectivityAvg   = ThisCleanInspRec<CLEAN_INSP_SCAN_SUM_OF_DEF_AVG$>
-		        DefectivityMin   = ThisCleanInspRec<CLEAN_INSP_SCAN_SUM_OF_DEF_MIN$>
-		        DefectivityMax   = ThisCleanInspRec<CLEAN_INSP_SCAN_SUM_OF_DEF_MAX$>
+		        ScanCount = DCount(ThisCleanInspRec<CLEAN_INSP_SCAN_SUM_OF_DEF_AVG$>, @VM)
+		        If ScanCount GT 1 then
+					DefectivityAvg   = OConv(ThisCleanInspRec<CLEAN_INSP_SCAN_SUM_OF_DEF_AVG$, ScanCount>, 'MD3')
+					DefectivityMin   = ThisCleanInspRec<CLEAN_INSP_SCAN_SUM_OF_DEF_MIN$, ScanCount>
+					DefectivityMax   = ThisCleanInspRec<CLEAN_INSP_SCAN_SUM_OF_DEF_MAX$, ScanCount>
+		        end else
+					DefectivityAvg   = OConv(ThisCleanInspRec<CLEAN_INSP_SCAN_SUM_OF_DEF_AVG$>, 'MD3')
+					DefectivityMin   = ThisCleanInspRec<CLEAN_INSP_SCAN_SUM_OF_DEF_MIN$>
+					DefectivityMax   = ThisCleanInspRec<CLEAN_INSP_SCAN_SUM_OF_DEF_MAX$>
+		        end
+		        
 		        Line := DefectivityAvg : @VM : DefectivityMin : @VM : DefectivityMax : @VM
 		    end
 		    Result<-1> = Line
@@ -209,6 +216,7 @@ if CustNo EQ 7108 then
     //This is EpiSil specific headers
     HeaderOut := '"Res/Rho Avg Layer 1"':@VM
     HeaderOut := '"Res/Rho Avg Layer 2"':@VM
+    HeaderOut := '"Res/Rho Std. Dev. Layer 1"':@VM
     HeaderOut := '"Res/Rho Std. Dev. Layer 2"':@VM
     HeaderOut := '"Thk Avg Layer 1"':@VM
     HeaderOut := '"Thk Avg Layer 2"':@VM
@@ -244,3 +252,4 @@ RETURN DOSTable
 
 
 
+