diff --git a/source/Lib/CommonLib/Contexts_ecm12.inl b/source/Lib/CommonLib/Contexts_ecm12.inl
index d8ec9344a9c67f892e00d2fd3b97c7cac7ea5aa8..06ffced6c437656353564aa5e57e2afdf6a056cf 100644
--- a/source/Lib/CommonLib/Contexts_ecm12.inl
+++ b/source/Lib/CommonLib/Contexts_ecm12.inl
@@ -475,23 +475,23 @@ const CtxSet ContextSetCfg::GeoMmvdStepMvpIdx = ContextSetCfg::addCtxSet({
 });
 
 const CtxSet ContextSetCfg::GeoBldFlag = ContextSetCfg::addCtxSet({
-// ctx 97 100
+// ctx 97 104
 #if JVET_AH0314_ADAPTIVE_GPM_BLENDING_IMPROV
- { 58, 22, 52, 21, 58, 22, 52, 21 },
- { 60, 51, 59, 44, 60, 51, 59, 44,},
- { 0, 0, 0, 0, 0, 0, 0, 0,},
- { 1, 1, 1, 1, 1, 1, 1, 1,},
- { 1, 1, 1, 1, 1, 1, 1, 1, },
- { 1, 1, 0, 1, 1, 1, 0, 1,},
- { 11, DWE, DWE, 11, 11, DWE, DWE, 11,},
- { 11, DWE, 11, 11, 11, DWE, 11, 11,},
- { 11, DWE, 4, 11, 11, DWE, 4, 11,},
- { 132, 116, 116, 117, 132, 116, 116, 117,},
- { DWO, 117, 132, 118, DWO, 117, 132, 118,},
- { 118, 117, 117, 117, 118, 117, 117, 117,},
- { 122, 118, 125, 122, 122, 118, 125, 122,},
- { DWO, 116, 117, 117, DWO, 116, 117, 117,},
- { 120, 117, 150, DWO, 120, 117, 150, DWO,},
+ {  58,  22,  45,  13,  58,  22,  45,  13 },
+ {  60,  36,  58,  36,  60,  36,  58,  36 },
+ {  35,  35,  35,  35,  35,  35,  35,  35 },
+ {   1,   1,   1,   1,   1,   1,   1,   1 },
+ {   1,   1,   1,   1,   1,   1,   1,   1 },
+ {   8,   8,   8,   8,   8,   8,   8,   8 },
+ {  11,  18,  18,  11,  11,  18,  18,  11 },
+ {   4,  18,  11,  11,   4,  18,  11,  11 },
+ {  18,  18,  18,  18,  18,  18,  18,  18 },
+ { 132, 116, 116, 117, 132, 116, 116, 117 },
+ { 118, 116, 132, 118, 118, 116, 132, 118 },
+ { 117, 116, 116, 117, 117, 116, 116, 117 },
+ { 118, 117, 133, 119, 118, 117, 133, 119 },
+ { 119, 119, 119, 119, 119, 119, 119, 119 },
+ { 119, 119, 119, 119, 119, 119, 119, 119 },
 #else
  {  58,  22,  45,  13 },
  {  60,  36,  58,  36 },