diff --git a/trunk/paradiseo-mo/src/algo/moVNS.h b/trunk/paradiseo-mo/src/algo/moVNS.h
index 25c6069d0..4b229f149 100644
--- a/trunk/paradiseo-mo/src/algo/moVNS.h
+++ b/trunk/paradiseo-mo/src/algo/moVNS.h
@@ -1,30 +1,30 @@
 /*
-<moVNS.h>
-Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+  <moVNS.h>
+  Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
 
-Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
+  Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau
 
-This software is governed by the CeCILL license under French law and
-abiding by the rules of distribution of free software.  You can  ue,
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info".
+  This software is governed by the CeCILL license under French law and
+  abiding by the rules of distribution of free software.  You can  ue,
+  modify and/ or redistribute the software under the terms of the CeCILL
+  license as circulated by CEA, CNRS and INRIA at the following URL
+  "http://www.cecill.info".
 
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or
-data to be ensured and,  more generally, to use and operate it in the
-same conditions as regards security.
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.
+  In this respect, the user's attention is drawn to the risks associated
+  with loading,  using,  modifying and/or developing or reproducing the
+  software by the user in light of its specific status of free software,
+  that may mean  that it is complicated to manipulate,  and  that  also
+  therefore means  that it is reserved for developers  and  experienced
+  professionals having in-depth computer knowledge. Users are therefore
+  encouraged to load and test the software's suitability as regards their
+  requirements in conditions enabling the security of their systems and/or
+  data to be ensured and,  more generally, to use and operate it in the
+  same conditions as regards security.
+  The fact that you are presently reading this means that you have had
+  knowledge of the CeCILL license and that you accept its terms.
 
-ParadisEO WebSite : http://paradiseo.gforge.inria.fr
-Contact: paradiseo-help@lists.gforge.inria.fr
+  ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+  Contact: paradiseo-help@lists.gforge.inria.fr
 */
 
 #ifndef _moVNS_h
@@ -34,20 +34,41 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <eoOp.h>
 #include <comparator/moSolComparator.h>
 #include <continuator/moContinuator.h>
-#include <neighborhood/moVariableNeighborhoodSelection.h>
 
+#include <explorer/moNeighborhoodExplorer.h>
+#include <neighborhood/moVariableNeighborhoodSelection.h>
+#include <acceptCrit/moAcceptanceCriterion.h>
+
+
+/**
+ * the "Variable Neighborhood Search" metaheuristic
+ */
 template<class Neighbor>
 class moVNS: public moLocalSearch< Neighbor >
 {
-
 public:
+  typedef typename Neighbor::EOT EOT;
+  typedef moNeighborhood<Neighbor> Neighborhood ;
 
-	typedef typename Neighbor::EOT EOT;
 
-	moVNS()
-	{}
+  /**
+   * full constructor for a VNS
+   * @param _selection selection the "neighborhood" search heuristics during the search
+   * @param _acceptCrit acceptance criteria which compare and accept or not the two solutions
+   * @param _fullEval the full evaluation function
+   * @param _cont an external continuator
+   */
+  moVNS(moVariableNeighborhoodSelection<EOT> & _selection,
+	moAcceptanceCriterion<Neighbor>& _acceptCrit,
+	eoEvalFunc<EOT>& _fullEval,
+	moContinuator<Neighbor>& _cont) :
+    moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
+    explorer(_selection, _acceptCrit)
+  {}
 
 private:
+  // the explorer of the VNS
+  moVNSexplorer<Neighbor> explorer;
 
 };
 
diff --git a/trunk/paradiseo-mo/src/mo.h b/trunk/paradiseo-mo/src/mo.h
index 96a519072..f4b1f02d0 100755
--- a/trunk/paradiseo-mo/src/mo.h
+++ b/trunk/paradiseo-mo/src/mo.h
@@ -53,6 +53,7 @@
 #include <algo/moSimpleHC.h>
 #include <algo/moTS.h>
 #include <algo/moVNS.h>
+#include <algo/moSimpleVNS.h>
 
 #include <comparator/moComparator.h>
 #include <comparator/moNeighborComparator.h>
diff --git a/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h b/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h
index fb307fad8..3debb85d4 100644
--- a/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h
+++ b/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h
@@ -45,7 +45,6 @@ template< class EOT >
 class moRndVectorVNSelection: public moVectorVNSelection<EOT>
 {
   using moVectorVNSelection<EOT>::LSvector;
-  //  using moVectorVNSelection<EOT>::shakeVector;
   using moVectorVNSelection<EOT>::current;
 
 public: