diff --git a/Profiles.h b/Profiles.h
index 8317e9efaa76b6c0b41ac1e755c1709684190089..033e58fc80751fb0a5574228d593fd7d59ab9212 100644
--- a/Profiles.h
+++ b/Profiles.h
@@ -28,6 +28,17 @@
 
 
 // TRIGO
+#define PROFILE_TRIGO_STARTPOINT_TIME           120
+#define PROFILE_TRIGO_BETAGLUCANASE_TIME        0
+#define PROFILE_TRIGO_DEBRANCHING_TIME          0
+#define PROFILE_TRIGO_PROTEOLYTIC_TIME          0
+#define PROFILE_TRIGO_BETAAMYLASE_TIME          2832                             // 3600 - 768 : 768 is the time to get from 62C to 70C
+#define PROFILE_TRIGO_ALPHAAMYLASE_TIME         1032                             // 1800 - 768 : 768 is the time to get from 70C to 78C
+#define PROFILE_TRIGO_MASHOUT_TIME              PROFILE_BASIC_MASHOUT_TIME
+#define PROFILE_TRIGO_RECIRCULATION_TIME        0
+#define PROFILE_TRIGO_SPARGE_TIME               3600
+#define PROFILE_TRIGO_BOIL_TIME                 5400
+#define PROFILE_TRIGO_COOLING_TIME              1800
 
 #define PROFILE_TRIGO_STARTPOINT_TEMPERATURE    65
 #define PROFILE_TRIGO_BETAGLUCANASE_TEMPERATURE PROFILE_BASIC_BETAGLUCANASE_TEMPERATURE
@@ -41,18 +52,6 @@
 #define PROFILE_TRIGO_BOIL_TEMPERATURE          PROFILE_BASIC_BOIL_TEMPERATURE
 #define PROFILE_TRIGO_COOLING_TEMPERATURE       PROFILE_BASIC_COOLING_TEMPERATURE
 
-#define PROFILE_TRIGO_STARTPOINT_TIME           120
-#define PROFILE_TRIGO_BETAGLUCANASE_TIME        0
-#define PROFILE_TRIGO_DEBRANCHING_TIME          0
-#define PROFILE_TRIGO_PROTEOLYTIC_TIME          0
-#define PROFILE_TRIGO_BETAAMYLASE_TIME          2832                             // 3600 - 768 : 768 is the time to get from 62C to 70C
-#define PROFILE_TRIGO_ALPHAAMYLASE_TIME         1032                             // 1800 - 768 : 768 is the time to get from 70C to 78C
-#define PROFILE_TRIGO_MASHOUT_TIME              PROFILE_BASIC_MASHOUT_TIME
-#define PROFILE_TRIGO_RECIRCULATION_TIME        0
-#define PROFILE_TRIGO_SPARGE_TIME               3600
-#define PROFILE_TRIGO_BOIL_TIME                 5400
-#define PROFILE_TRIGO_COOLING_TIME              1800
-
 //#define PROFILE_TRIGO_WHEAT_MULTIPLIER          0.05
 //#define PROFILE_TRIGO_PILSNER_MULTIPLIER        0.2
 //#define PROFILE_TRIGO_MAGNUM_MULTIPLIER         0.05
diff --git a/brew.ino b/brew.ino
index 1655232f0e2003f26bc63b07c37249b6fdfe2535..b1e652a51d194a19eb0c0997582aaff8c09083e1 100644
--- a/brew.ino
+++ b/brew.ino
@@ -6,8 +6,8 @@
 
 //#define DEBUG
 #define INFO
-#define HEATING_ELEMENT_ALWAYS_OFF
-#define PUMP_ALWAYS_OFF
+//#define HEATING_ELEMENT_ALWAYS_OFF
+//#define PUMP_ALWAYS_OFF
 
 // ######################### LIBRARIES #########################
 #include "brew.h"
@@ -1018,11 +1018,11 @@ void xManageMachineSystems() {
         break;
       }
     case eCookingStage_Mashout: {
-        xBasicStageOperation( mashoutTime, mashoutTemperature, 1.0, eCookingStage_Recirculation, true );
+        xBasicStageOperation( mashoutTime, mashoutTemperature, 3.0, eCookingStage_Recirculation, true );
         break;
       }
     case eCookingStage_Recirculation: {
-        xBasicStageOperation( recirculationTime, recirculationTemperature, 1.0, eCookingStage_Sparge, true );
+        xBasicStageOperation( recirculationTime, recirculationTemperature, 2.0, eCookingStage_Sparge, true );
         break;
       }
     case eCookingStage_Sparge: {