diff -Naur HM-16.6-JEM-6.0-EE1-Test3-7/source/Lib/TLibCommon/TComPrediction.cpp HM-16.6-JEM-6.0-EE1-Test3-7-staging/source/Lib/TLibCommon/TComPrediction.cpp
--- /source/Lib/TLibCommon/TComPrediction.cpp	2017-07-05 14:37:17.972497321 -0700
+++ /source/Lib/TLibCommon/TComPrediction.cpp	2017-07-05 15:12:04.080396300 -0700
@@ -960,7 +960,11 @@
     if( uiDirMode == PLANAR_IDX )
     {
 #if E0068_UW_PLANAR
+#if SETTING3
+      iPdpcIdx = 1;
+#else
       iPdpcIdx = 0;
+#endif
 #else
       iPdpcIdx = 1;
 #endif
@@ -1165,6 +1169,12 @@
           Int Coeff_Left    = pPdpcPar[0] >> shiftCol;
           Int Coeff_TopLeft = (pPdpcPar[1] >> shiftCol) + Coeff_offset;
 #endif
+#if SETTING3
+          if (uiDirMode==VDIA_IDX)
+          {
+            Coeff_Left = Coeff_Top = Coeff_TopLeft = ParOffset = 0;     // no PDPC postfilter for W66
+          }
+#endif
           Int Coeff_Cur     = ParScale - Coeff_Left - Coeff_Top + Coeff_TopLeft;
 
           Int sampleVal = (Coeff_Left* piRefVector[-row - 1] + Coeff_Top * piRefVector[col + 1] - Coeff_TopLeft * piRefVector[0] + Coeff_Cur * pDst[pos] + ParOffset) >> ParShift;
@@ -1275,7 +1285,9 @@
         if( uiDirMode == 34 )
 #endif
         {
+#if !SETTING3
           xIntraPredFilteringMode34( ptrSrc+sw+1, sw, pDst, uiStride, iWidth, iHeight);
+#endif
         }
         else  if( uiDirMode == 2 )
         {
diff -Naur HM-16.6-JEM-6.0-EE1-Test3-7/source/Lib/TLibCommon/TypeDef.h HM-16.6-JEM-6.0-EE1-Test3-7-staging/source/Lib/TLibCommon/TypeDef.h
--- /source/Lib/TLibCommon/TypeDef.h	2017-07-05 14:37:15.652502184 -0700
+++ /source/Lib/TLibCommon/TypeDef.h	2017-07-05 15:12:04.085896300 -0700
@@ -44,12 +44,14 @@
 
 #include <vector>
 
-#define EE1_TEST3                                         0 // P-PDPC, PDPC-L, ARSS off, NSST+PDPC
+#define EE1_TEST3                                         1 // P-PDPC, PDPC-L, ARSS off, NSST+PDPC
 #define EE1_TEST4                                         0 // P-PDPC, PDPC-L, ARSS off
 #define EE1_TEST5                                         0 // P-PDPC, PDPC for J66 is off and no PDPC flag, PDPC-L, ARSS off
 #define EE1_TEST6                                         0 // PDPC on, ARSS is explicitly signaled as in F0055
 #define EE1_TEST7                                         0 // P-PDPC, ARSS off
 
+#define SETTING3                                          1 // enable changes for UWP and W66
+
 #if EE1_TEST3
 #define MOD_PDPC                                          1  // replace ARSS encoder RDs with PDPC, F0054
 #define ENABLE_PDPC_FOR_NSST                              1  // enable PDPC with NSST
@@ -81,8 +83,13 @@
 #endif
 
 #if MOD_PDPC
+#if SETTING3
+#define E0068_UW_PLANAR                                   1
+#define F0104_W66                                         1
+#else
 #define E0068_UW_PLANAR                                   0
 #define F0104_W66                                         0
+#endif
 
 #define DISABLE_RSAF                                      1  // disable ARSS
 #define PDPC_FORCE_PLANAR                                 1  // no PDPC flag is signaled for Planar, and PDPC index is inferred eqaul to 1
