Index: firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c
===================================================================
diff -u -r64acabc33ab795591768801f8b443f0da9ee2b98 -ra36dcbc3e2f94d418d8aa54588c836a3adf35e17
--- firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision 64acabc33ab795591768801f8b443f0da9ee2b98)
+++ firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision a36dcbc3e2f94d418d8aa54588c836a3adf35e17)
@@ -273,6 +273,24 @@
 
 /*********************************************************************//**
  * @brief
+ * The validateGenPDefeaturedChangeReq function validate whether requested
+ * sub mode change is legal or not.
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @return TRUE if request is legal, FALSE if not.
+ *************************************************************************/
+BOOL validateGenPDefeaturedChangeReq( U32 newSubMode )
+{
+    BOOL result = FALSE;
+
+    // TODO add validation logic
+    result = TRUE;
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The signalNewGenPDefeaturedSubMode function requests transition to a new
  * defeatured Gen Permeate sub mode.
  * @details \b Alarm: ALARM_ID_FP_SOFTWARE_FAULT if given new sub mode is invalid.
@@ -286,21 +304,20 @@
 
     if ( reqSubMode < NUM_OF_FP_GENP_DEF_MODE_STATES )
     {
+        genPermeateDefState = reqSubMode;
+        // handle the pre-requisite if any
         switch ( reqSubMode )
         {
             case FP_GENP_DEF_SUPPLY_WATER:
-                genPermeateDefState = FP_GENP_DEF_SUPPLY_WATER;
-                setModeGenPDefTransition( reqSubMode );
                 break;
 
             case FP_GENP_DEF_PAUSED:
-                genPermeateDefState = FP_GENP_DEF_PAUSED;
-                setModeGenPDefTransition( reqSubMode );
                 break;
 
             default:
                 break;
         }
+        setModeGenPDefTransition( reqSubMode );
     }
 }