Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r922516483829939a2a387d4a2fddeccdb4c454d4 -r47205a5002f27add91d8548f31c8a6fa18993fea
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 922516483829939a2a387d4a2fddeccdb4c454d4)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 47205a5002f27add91d8548f31c8a6fa18993fea)
@@ -214,7 +214,8 @@
         monitorLoadCellsWeightOutOfRange( (LOAD_CELL_ID_T)ii );
 
         // Apply the tare offset. NOTE: tare must be applied after checking the weight out of range.
-        loadcells[ ii ].weight.data = loadcells[ ii ].weight.data - loadcells[ ii ].autoCalOffset;
+        //loadcells[ ii ].weight.data = loadcells[ ii ].weight.data - loadcells[ ii ].autoCalOffset; TODO remove this
+        loadcells[ ii ].smallFilteredWeight -= loadcells[ ii ].autoCalOffset;
     }
 
     smallReadingsIdx = INC_WRAP( smallReadingsIdx, 0, SIZE_OF_SMALL_LOAD_CELL_AVG - 1 );
@@ -550,8 +551,8 @@
         drift = ( loadCellADrift > loadCellBDrift ? loadCellADrift : loadCellBDrift );
     }
 
-    checkPersistentAlarm( ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, isDriftOutOfRange, drift,
-                          LOAD_CELL_PRIMARY_BACKUP_MAX_ALLOWED_DRIFT_GRAMS );
+    //checkPersistentAlarm( ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, isDriftOutOfRange, drift,
+     //                     LOAD_CELL_PRIMARY_BACKUP_MAX_ALLOWED_DRIFT_GRAMS );
 }