diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt
index 8a446d06..a59f75b7 100644
--- a/unicorn/CMakeLists.txt
+++ b/unicorn/CMakeLists.txt
@@ -79,6 +79,13 @@ FIND_PACKAGE(KITE REQUIRED)
 #FIND_PACKAGE(SOLSTICE REQUIRED)
 
 SET_LIB_LINK_MODE()
-FIND_PACKAGE(Boost 1.33.1 COMPONENTS filesystem program_options REQUIRED)
+SET(Boost_USE_STATIC_LIBS ON)
+MESSAGE(STATUS "Always uses Boost static libraries.")
+FIND_PACKAGE(Boost 1.35.0 COMPONENTS program_options filesystem system regex python)
+IF(NOT Boost_FOUND)
+  FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem python regex REQUIRED)
+ENDIF(NOT Boost_FOUND)
+MESSAGE(STATUS "Found Boost libraries ${Boost_LIB_VERSION} in ${Boost_INCLUDE_DIR}")
+MESSAGE(STATUS "  ${Boost_LIBRARIES}")
 
 ADD_SUBDIRECTORY(src)
diff --git a/unicorn/src/CMakeLists.txt b/unicorn/src/CMakeLists.txt
index 37998ff6..69a51263 100644
--- a/unicorn/src/CMakeLists.txt
+++ b/unicorn/src/CMakeLists.txt
@@ -40,6 +40,7 @@
                                        ${HMETIS_LIBRARIES}
                                        ${NIMBUS_GRAPHICAL_LIBRARIES}
                                        ${NIMBUS_LIBRARIES}
+                                       ${CORIOLIS_PYTHON_LIBRARIES}
                                        ${CORIOLIS_LIBRARIES}
                                        ${HURRICANE_PYTHON_LIBRARIES}
                                        ${HURRICANE_GRAPHICAL_LIBRARIES}
@@ -50,33 +51,13 @@
                                        ${LEFDEF_LIBRARIES}
                                        ${OA_LIBRARIES}
                                        ${QT_LIBRARIES}
+                                       ${Boost_LIBRARIES}
                                        ${PYTHON_LIBRARIES}
                                        -lutil
                                        ${LIBXML2_LIBRARIES}
                        )
         add_executable ( cgt           ${cgtcpp} )
- target_link_libraries ( cgt           unicorn
-                                       ${SOLSTICE_GRAPHICAL_LIBRARIES}
-                                       ${SOLSTICE_LIBRARIES}
-                                       ${EQUINOX_GRAPHICAL_LIBRARIES}
-                                       ${EQUINOX_LIBRARIES}
-                                       ${KITE_GRAPHICAL_LIBRARIES}
-                                       ${KITE_LIBRARIES}
-                                       ${KATABATIC_GRAPHICAL_LIBRARIES}
-                                       ${KATABATIC_LIBRARIES}
-                                       ${KNIK_GRAPHICAL_LIBRARIES}
-                                       ${KNIK_LIBRARIES}
-                                       ${CORIOLIS_LIBRARIES}
-                                       ${HURRICANE_PYTHON_LIBRARIES}
-                                       ${HURRICANE_LIBRARIES}
-                                       ${HURRICANE_GRAPHICAL_LIBRARIES}
-                                       ${CONFIGURATION_LIBRARY}
-                                       ${OA_LIBRARIES}
-                                       ${QT_LIBRARIES}
-                                       ${Boost_LIBRARIES}
-                                       ${PYTHON_LIBRARIES}
-                                       -lutil
-                       )
+ target_link_libraries ( cgt           unicorn )
                install ( TARGETS       unicorn DESTINATION lib${LIB_SUFFIX} )
                install ( TARGETS       cgt     DESTINATION bin )
                install ( FILES         ${includes}
diff --git a/unicorn/src/CgtMain.cpp b/unicorn/src/CgtMain.cpp
index c9e77220..c362f373 100644
--- a/unicorn/src/CgtMain.cpp
+++ b/unicorn/src/CgtMain.cpp
@@ -340,16 +340,17 @@ int main ( int argc, char *argv[] )
 
     // Python Script test.
 
-      Isobar::Script::addPath ( "/dsk/l1/jpc/coriolis-2.x/work/benchs/routing/addaccu" );
+    //Isobar::Script::addPath ( "/dsk/l1/jpc/coriolis-2.x/work/benchs/routing/addaccu" );
 
-      for ( int i=0 ; i<5 ; ++i ) {
-        cerr << "Call:" << i << " ======================================" << endl;
+      // for ( int i=0 ; i<25 ; ++i ) {
+      //   cerr << "Call:" << i << "/25 ======================================" << endl;
 
-        Isobar::Script* script = Isobar::Script::create ( "getCellName" );
-        script->runFunction ( "runScript", cell );
-      }
+      //   Isobar::Script* script = Isobar::Script::create ( "getCellName" );
+      //   script->runFunction ( "__hurricane_main__", cell );
+      // }
+      // cerr << "DONE" << endl;
 
-      Box box ( DbU::lambda(0.0), DbU::lambda(0.0), DbU::lambda(5.0), DbU::lambda(10.0) );
+      // Box box ( DbU::lambda(0.0), DbU::lambda(0.0), DbU::lambda(5.0), DbU::lambda(10.0) );
       
       // throw Error ("Tu le vois bien: <b>%s</b><br>"
       //             "Un retour a la ligne\n<i>Une ligne</i>"