diff --git a/src/Mathematics/FootConstraintsAsLinearSystemForVelRef.h b/src/Mathematics/FootConstraintsAsLinearSystemForVelRef.h
index 72ec73dbfa19999c458e5ce580652beafdbd27ec..fb697a3d9eb82feb0eba3408fa861ab4d2336a88 100644
--- a/src/Mathematics/FootConstraintsAsLinearSystemForVelRef.h
+++ b/src/Mathematics/FootConstraintsAsLinearSystemForVelRef.h
@@ -84,7 +84,7 @@ namespace PatternGeneratorJRL
       int computeLinearSystem(std::vector<CH_Point> aVecOfPoints,
 			      MAL_MATRIX(&D,double),
 			      MAL_MATRIX(&Dc,double),
-			      SupportState * Support);
+			      SupportState_t PrwSupport);
 
       /*!  Build a queue of constraint Inequalities based on a list of Foot Absolute
 	Position.
@@ -98,7 +98,8 @@ namespace PatternGeneratorJRL
 					    ReferenceAbsoluteVelocity & RefVel,
 					    double StartingTime,
 					    double m_QP_N,
-					    SupportState * Support, std::deque<double> &PreviewedSupportAngles,
+					    SupportFSM * SupportFSM, SupportState_t CurrentSupport, SupportState_t & PrwSupport,
+					    std::deque<double> &PreviewedSupportAngles,
 					    int & NbOfConstraints);
 
       /*!  Build a queue of constraint Inequalities based on a list of Foot Absolute Position.  */
@@ -127,13 +128,6 @@ namespace PatternGeneratorJRL
       CjrlHumanoidDynamicRobot * m_HS;
       
       std::vector<CH_Point> ConvexHullFP;
-
-      //Andremize: Caused memory errors when initialized in the constructor
-      /* float CHLeftFPosConstrArrayX[5]; */
-      /* float CHLeftFPosConstrArrayY[5]; */
-      
-      /* float CHRightFPosConstrArrayX[5]; */
-      /* float CHRightFPosConstrArrayY[5]; */
       
       float* CHFPosConstrArrayX; 
       float* CHFPosConstrArrayY;