Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -r57e75927d6190e475457f152b082815839ccbf8b -r9775f66eab915af9b353006a4fcb8d1f393a410d
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision 57e75927d6190e475457f152b082815839ccbf8b)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision 9775f66eab915af9b353006a4fcb8d1f393a410d)
@@ -42,7 +42,6 @@
 /// Level status structure
 typedef struct
 {
-    OVERRIDE_U32_T status;                                                                          ///< Level status.
     U32 priorRawLevel;                                                                              ///< Prior level state (not debounced).
     U32 debounceStartTime;                                                                          ///< Debounce start time.
     U32 debounceTime;                                                                               ///< Debounce time
@@ -54,6 +53,7 @@
 static OVERRIDE_U32_T levelsDataPublishInterval = { LEVEL_DATA_PUB_INTERVAL,
                                                       LEVEL_DATA_PUB_INTERVAL, 0, 0 };              ///< Interval (in ms) at which to publish Level data to CAN bus.
 static LEVEL_STATUS_T levelsStatus[ NUM_OF_LEVELS ];                                                ///< Level status array.
+static OVERRIDE_U32_T status[ NUM_OF_LEVELS ];                                                      ///< Level status.
 
 // ********** private function prototypes **********
 
@@ -76,10 +76,10 @@
     // Initialize all the Level
     for ( i = 0; i < NUM_OF_LEVELS; i++ )
     {
-        levelsStatus[ i ].status.data       = (U32)LEVEL_STATE_HIGH;
-        levelsStatus[ i ].status.ovData     = (U32)LEVEL_STATE_HIGH;
-        levelsStatus[ i ].status.ovInitData = (U32)LEVEL_STATE_HIGH;
-        levelsStatus[ i ].status.override   = OVERRIDE_RESET;
+        status[ i ].data                    = (U32)LEVEL_STATE_HIGH;
+        status[ i ].ovData                  = (U32)LEVEL_STATE_HIGH;
+        status[ i ].ovInitData              = (U32)LEVEL_STATE_HIGH;
+        status[ i ].override                = OVERRIDE_RESET;
         levelsStatus[ i ].debounceStartTime = 0;
         levelsStatus[ i ].debounceTime      = LEVEL_DEBOUNCE_TIME_MS;
         levelsStatus[ i ].priorRawLevel     = (U32)LEVEL_STATE_HIGH;
@@ -144,7 +144,7 @@
         }
 
         // Check if the current level status is not the same as the recorded data
-        if ( currentLevelStatus != levelsStatus[ i ].status.data )
+        if ( currentLevelStatus != status[ i ].data )
         {
             // If the debounce time is 0, start the timer
             if ( ( 0 == levelsStatus[ i ].debounceStartTime ) || ( currentLevelStatus != levelsStatus[i].priorRawLevel ) )
@@ -157,15 +157,15 @@
                 switch ( i )
                 {
                     case FLOATER_LEVEL:
-                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_FLOATER_LEVEL_CHANGE, (U32)levelsStatus[ i ].status.data, (U32)currentLevelStatus );
+                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_FLOATER_LEVEL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus );
                         break;
 
                     case BICARB_LEVEL:
-                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BICARB_LEVEL_CHANGE, (U32)levelsStatus[ i ].status.data, (U32)currentLevelStatus );
+                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BICARB_LEVEL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus );
                         break;
 
                     case SPENT_DIALYSATE_LEVEL:
-                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_SPENT_DIALYSATE_LEVEL_CHANGE, (U32)levelsStatus[ i ].status.data, (U32)currentLevelStatus );
+                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_SPENT_DIALYSATE_LEVEL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus );
                         break;
 
 #ifndef _VECTORCAST_
@@ -176,7 +176,7 @@
                 }
 
                 levelsStatus[ i ].debounceStartTime = 0;
-                levelsStatus[ i ].status.data       = currentLevelStatus;
+                status[ i ].data                    = currentLevelStatus;
             }
         }
         else
@@ -202,24 +202,24 @@
  *************************************************************************/
 LEVEL_STATE_T getLevelStatus( LELVEL_T levelId )
 {
-    U32 status = 0;
+    U32 stat = 0;
 
     if ( levelId < NUM_OF_LEVELS )
     {
         // Assume there is no override
-        status = levelsStatus[ levelId ].status.data;
+        stat = status[ levelId ].data;
 
-        if ( OVERRIDE_KEY == levelsStatus[ levelId ].status.override )
+        if ( OVERRIDE_KEY == status[ levelId ].override )
         {
-            status = levelsStatus[ levelId ].status.ovData;
+            stat = status[ levelId ].ovData;
         }
     }
     else
     {
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_DD_INVALID_LEVEL_ID, (U32)levelId )
     }
 
-    return (LEVEL_STATE_T)status;
+    return (LEVEL_STATE_T)stat;
 }
 
 /*********************************************************************//**
@@ -316,7 +316,7 @@
  *************************************************************************/
 BOOL testLevelStatusOverride( MESSAGE_T *message )
 {
-    BOOL result = u32ArrayOverride( message, &levelsStatus[0].status, NUM_OF_LEVELS - 1, 0, NUM_OF_LEVELS_STATES -1 );
+    BOOL result = u32ArrayOverride( message, &status[0], NUM_OF_LEVELS - 1, 0, NUM_OF_LEVELS_STATES -1 );
 
     return result;
 }