diff --git a/src/myeeprom.h b/src/myeeprom.h
index 1ee7d1af7..4fc3cbd6c 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -321,7 +321,7 @@ PACK(typedef struct t_MixData {
 #define MD_WEIGHT(md) (md->weight)
 #define MD_WEIGHT_TO_UNION(md, var) var.word = md->weight
 #define MD_UNION_TO_WEIGHT(var, md) md->weight = var.word
-#define MD_SETWEIGHT(md, val) md->weight = val
+// #define MD_SETWEIGHT(md, val) md->weight = val
 
 PACK( union u_int8int16_t {
   struct {
@@ -334,7 +334,7 @@ PACK( union u_int8int16_t {
 #define MD_OFFSET(md) (md->offset)
 #define MD_OFFSET_TO_UNION(md, var) var.word = md->offset
 #define MD_UNION_TO_OFFSET(var, md) md->offset = var.word
-#define MD_SETOFFSET(md, val) md->offset = val
+// #define MD_SETOFFSET(md, val) md->offset = val
 
 #else
 #define DELAY_STEP  2
@@ -388,12 +388,12 @@ PACK( union u_int8int16_t {
 
 #define MD_WEIGHT_TO_UNION(md, var) var.bytes_t.lo=md->weight; var.bytes_t.hi=md->weightMode?255:0
 #define MD_UNION_TO_WEIGHT(var, md) md->weight=var.bytes_t.lo; if (var.word<0) md->weightMode=1; else md->weightMode=0
-#define MD_SETWEIGHT(md, val) md->weight=val; if (val<0) md->weightMode=1; else md->weightMode=0 
+// #define MD_SETWEIGHT(md, val) md->weight=val; if (val<0) md->weightMode=1; else md->weightMode=0 
 
 #define MD_OFFSET(md) (u_gvarint_t(md->offset,md->offsetMode).word)
 #define MD_OFFSET_TO_UNION(md, var) var.bytes_t.lo=md->offset; var.bytes_t.hi=md->offsetMode?255:0
 #define MD_UNION_TO_OFFSET(var, md) md->offset=var.bytes_t.lo; if (var.word<0) md->offsetMode=1; else md->offsetMode=0 /* set negative sign */
-#define MD_SETOFFSET(md, val) md->offset=val; if (val<0) md->offsetMode=1; else md->offsetMode=0
+// #define MD_SETOFFSET(md, val) md->offset=val; if (val<0) md->offsetMode=1; else md->offsetMode=0
 
 #endif
 
diff --git a/src/templates.cpp b/src/templates.cpp
index 82f61f343..a05954f62 100644
--- a/src/templates.cpp
+++ b/src/templates.cpp
@@ -87,6 +87,14 @@ MixData* setDest(uint8_t dch, uint8_t src, bool clear=false)
   return mix;
 }
 
+void md_SetWeight(MixData* md, int8_t weight)
+{
+  u_int8int16_t tmp;
+  tmp.word=weight;
+  MD_UNION_TO_WEIGHT(tmp,md);
+  // MD_SETWEIGHT(md,weight);  doesn't matter here in code cost compiler optimizes this anyway
+}
+
 void clearMixes()
 {
   memset(g_model.mixData, 0, sizeof(g_model.mixData)); // clear all mixes
@@ -150,9 +158,9 @@ void applyTemplate(uint8_t idx)
 
       // Sticky-T-Cut
       case TMPL_STI_THR_CUT:
-        md=setDest(ICC(STK_THR), MIXSRC_MAX); MD_SETWEIGHT(md, -100);  md->swtch=SWSRC_SWC;  md->mltpx=MLTPX_REP;
+        md=setDest(ICC(STK_THR), MIXSRC_MAX); md_SetWeight(md, -100);  md->swtch=SWSRC_SWC;  md->mltpx=MLTPX_REP;
         md=setDest(13, MIXSRC_CH14); md->weight= 100;
-        md=setDest(13, MIXSRC_MAX); MD_SETWEIGHT(md, -100);  md->swtch=SWSRC_SWB;  md->mltpx=MLTPX_REP;
+        md=setDest(13, MIXSRC_MAX); md_SetWeight(md, -100);  md->swtch=SWSRC_SWB;  md->mltpx=MLTPX_REP;
         md=setDest(13, MIXSRC_MAX); md->weight= 100;  md->swtch=SWSRC_THR;  md->mltpx=MLTPX_REP;
         setSwitch(11, CS_VNEG, STK_THR, -99);
         setSwitch(12, CS_VPOS, MIXSRC_CH14, 0);
@@ -161,7 +169,7 @@ void applyTemplate(uint8_t idx)
       // V-Tail
       case TMPL_V_TAIL:
         setDest(ICC(STK_RUD), MIXSRC_Rud, true);
-        md=setDest(ICC(STK_RUD), MIXSRC_Ele); MD_SETWEIGHT(md, -100);
+        md=setDest(ICC(STK_RUD), MIXSRC_Ele); md_SetWeight(md, -100);
         setDest(ICC(STK_ELE), MIXSRC_Rud, true);
         setDest(ICC(STK_ELE), MIXSRC_Ele);
         break;
@@ -171,18 +179,18 @@ void applyTemplate(uint8_t idx)
         setDest(ICC(STK_ELE), MIXSRC_Ele, true);
         setDest(ICC(STK_ELE), MIXSRC_Ail);
         setDest(ICC(STK_AIL), MIXSRC_Ele, true);
-        md=setDest(ICC(STK_AIL), MIXSRC_Ail); MD_SETWEIGHT(md, -100);
+        md=setDest(ICC(STK_AIL), MIXSRC_Ail); md_SetWeight(md, -100);
         break;
 
       // eCCPM
       case TMPL_ECCPM:
         md=setDest(ICC(STK_ELE), MIXSRC_Ele, true); md->weight= 72;
         md=setDest(ICC(STK_ELE), MIXSRC_Thr);  md->weight= 55;
-        md=setDest(ICC(STK_AIL), MIXSRC_Ele, true);  MD_SETWEIGHT(md, -36);
+        md=setDest(ICC(STK_AIL), MIXSRC_Ele, true);  md_SetWeight(md, -36);
         md=setDest(ICC(STK_AIL), MIXSRC_Ail);  md->weight= 62;
         md=setDest(ICC(STK_AIL), MIXSRC_Thr);  md->weight= 55;
-        md=setDest(5, MIXSRC_Ele, true);       MD_SETWEIGHT(md, -36);
-        md=setDest(5, MIXSRC_Ail);             MD_SETWEIGHT(md, -62);
+        md=setDest(5, MIXSRC_Ele, true);       md_SetWeight(md, -36);
+        md=setDest(5, MIXSRC_Ail);             md_SetWeight(md, -62);
         md=setDest(5, MIXSRC_Thr);             md->weight= 55;
         break;
 
@@ -203,11 +211,11 @@ void applyTemplate(uint8_t idx)
 	md=setDest(4, MIXSRC_Thr); md->swtch=SWSRC_ID0; md->curveMode=MODE_CURVE; md->curveParam=CV(1); md->carryTrim=TRIM_OFF;
 	md=setDest(4, MIXSRC_Thr); md->swtch=SWSRC_ID1; md->curveMode=MODE_CURVE; md->curveParam=CV(2); md->carryTrim=TRIM_OFF;
 	md=setDest(4, MIXSRC_Thr); md->swtch=SWSRC_ID2; md->curveMode=MODE_CURVE; md->curveParam=CV(3); md->carryTrim=TRIM_OFF;
-        md=setDest(4, MIXSRC_MAX); MD_SETWEIGHT(md, -100); md->swtch=SWSRC_THR;  md->mltpx=MLTPX_REP;
+        md=setDest(4, MIXSRC_MAX); md_SetWeight(md, -100); md->swtch=SWSRC_THR;  md->mltpx=MLTPX_REP;
 
         // gyro gain
         md=setDest(5, MIXSRC_MAX); md->weight= 30; md->swtch=-SWSRC_GEA;
-        md=setDest(5, MIXSRC_MAX); MD_SETWEIGHT(md, -30); md->swtch= SWSRC_GEA;
+        md=setDest(5, MIXSRC_MAX); md_SetWeight(md, -30); md->swtch= SWSRC_GEA;
    
         // collective
 	md=setDest(11, MIXSRC_Thr); md->weight= 100; md->swtch=SWSRC_ID0; md->curveMode=MODE_CURVE; md->curveParam=CV(4); md->carryTrim=TRIM_OFF;