Index: firmware/App/Modes/FPModes/ModeGenPermeate.c
===================================================================
diff -u -r64acabc33ab795591768801f8b443f0da9ee2b98 -ra36dcbc3e2f94d418d8aa54588c836a3adf35e17
--- firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 64acabc33ab795591768801f8b443f0da9ee2b98)
+++ firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision a36dcbc3e2f94d418d8aa54588c836a3adf35e17)
@@ -243,6 +243,24 @@
 
 /*********************************************************************//**
  * @brief
+ * The validateGenPermeateChangeReq 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 validateGenPermeateChangeReq( U32 newSubMode )
+{
+    BOOL result = FALSE;
+
+    // TODO add validation logic
+    result = TRUE;
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The signalNewGenPermeateSubMode function requests transition to
  * a new Gen Permeate sub mode.
  * @details \b Inputs: none
@@ -255,20 +273,19 @@
 
     if ( reqSubMode < NUM_OF_FP_GENP_MODE_STATES )
     {
+        genPermeateState = reqSubMode;
+        // handle the pre-requisite if any
         switch ( reqSubMode )
         {
             case FP_GENP_TANK_FILL_STATE:
-                genPermeateState = FP_GENP_TANK_FILL_STATE;
-                setModeGenPTransition( reqSubMode );
                 break;
 
             case FP_GENP_TANK_FULL_STATE:
-                genPermeateState = FP_GENP_TANK_FULL_STATE;
-                setModeGenPTransition( reqSubMode );
                 break;
             default:
                 break;
         }
+        setModeGenPTransition( reqSubMode );
     }
 }