Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942 -r8aa885b17330f096934f175d35912c3c95825039
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 8aa885b17330f096934f175d35912c3c95825039)
@@ -404,9 +404,11 @@
             case DD_FAULT_STATE_START:
             case DD_FAULT_DEENERGIZED_STATE:
             case DD_FAULT_ENERGIZED_STATE:
-            default:
                 result = TRUE;
                 break;
+
+            default:
+                break;
         }
     }
 
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r37a576d648872455727fee75fe883890b185f370 -r8aa885b17330f096934f175d35912c3c95825039
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 37a576d648872455727fee75fe883890b185f370)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 8aa885b17330f096934f175d35912c3c95825039)
@@ -1330,7 +1330,6 @@
             case DD_GEND_BICARB_CHAMBER_FILL_STATE:
             case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
             default:
-                result = FALSE;
                 break;
         }
     }
Index: firmware/App/Modes/ModePostGenDialysate.c
===================================================================
diff -u -r345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942 -r8aa885b17330f096934f175d35912c3c95825039
--- firmware/App/Modes/ModePostGenDialysate.c	(.../ModePostGenDialysate.c)	(revision 345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942)
+++ firmware/App/Modes/ModePostGenDialysate.c	(.../ModePostGenDialysate.c)	(revision 8aa885b17330f096934f175d35912c3c95825039)
@@ -206,8 +206,10 @@
             // TODO add validate condition after checking with Vinay
             case DD_POST_GEN_DIALYSATE_STATE_START:
             case DD_POST_GEN_DIALYSATE_STATE_COMPLETE:
+//                result = TRUE;     // TODO enable when states are implemented
+                break;
+
             default:
-                result = TRUE;
                 break;
         }
     }
Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -r345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942 -r8aa885b17330f096934f175d35912c3c95825039
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 8aa885b17330f096934f175d35912c3c95825039)
@@ -532,9 +532,11 @@
             case DD_PRE_GEN_WET_SELF_TEST:
             case DD_PRE_GEN_DRY_BICART_INITIAL_FILL:
             case DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND:
-            default:
                 result = TRUE;
                 break;
+
+            default:
+                break;
         }
     }
 
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942 -r8aa885b17330f096934f175d35912c3c95825039
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8aa885b17330f096934f175d35912c3c95825039)
@@ -497,9 +497,11 @@
         switch ( newSubMode )
         {
             case DD_STANDBY_MODE_STATE_IDLE:
+                result = TRUE;
+                break;
+
             case DD_STANDBY_MODE_STATE_PAUSE:
             default:
-                result = TRUE;
                 break;
         }
     }
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942 -r8aa885b17330f096934f175d35912c3c95825039
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 345a9b1694f4b0a9c9d3e9be45ee2e1f113dc942)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 8aa885b17330f096934f175d35912c3c95825039)
@@ -686,6 +686,7 @@
             testSignalNewDDPostGenDialysateSubMode( testRequestedSubMode );
             break;
 
+        // transition request is not supported yet. Update once the modes are implemented
         case DD_MODE_SERV:
         case DD_MODE_INIT:
         case DD_MODE_HEAT: