diff --git a/smp/src/abstractIsland.h b/smp/src/abstractIsland.h
index db0c4ba2b..fc4bebe98 100644
--- a/smp/src/abstractIsland.h
+++ b/smp/src/abstractIsland.h
@@ -74,7 +74,7 @@ public:
      * Update the island by adding population to send in the imigrants list.
      * @param _data Population to integrate.
      */
-    virtual void update(eoPop<bEOT> _data) = 0;
+    virtual bool update(eoPop<bEOT> _data) = 0;
     
     /**
      * Check if the algorithm is stopped.
diff --git a/smp/src/island.cpp b/smp/src/island.cpp
index 544ec51c1..ea3e5ea92 100644
--- a/smp/src/island.cpp
+++ b/smp/src/island.cpp
@@ -67,7 +67,7 @@ void paradiseo::smp::Island<EOAlgo,EOT,bEOT>::operator()()
     stopped = true;
     // Let's wait the end of communications with the island model
     for(auto& message : sentMessages)
-        message.join();
+        message.wait();
     
     // Clear the sentMessages container
     sentMessages.clear();
@@ -125,12 +125,12 @@ void paradiseo::smp::Island<EOAlgo,EOT,bEOT>::send(eoSelect<EOT>& _select)
        
         // Delete delivered messages
         sentMessages.erase(std::remove_if(sentMessages.begin(), sentMessages.end(), 
-            [&](std::thread& i) -> bool
-            { return !i.joinable(); }
+            [&](std::shared_future<bool>& i) -> bool
+            { return i.wait_for(std::chrono::nanoseconds(0)) == std::future_status::ready; }
             ), 
             sentMessages.end());
 
-        sentMessages.push_back(std::thread(&IslandModel<bEOT>::update, model, std::move(baseMigPop), this));
+        sentMessages.push_back(std::async(std::launch::async, &IslandModel<bEOT>::update, model, std::move(baseMigPop), this));
     }
 }
 
@@ -159,9 +159,11 @@ void paradiseo::smp::Island<EOAlgo,EOT,bEOT>::receive(void)
 }
 
 template<template <class> class EOAlgo, class EOT, class bEOT>
-void paradiseo::smp::Island<EOAlgo,EOT,bEOT>::update(eoPop<bEOT> _data)
+bool paradiseo::smp::Island<EOAlgo,EOT,bEOT>::update(eoPop<bEOT> _data)
 {
     //std::cout << "On update dans l'île" << std::endl;
     std::lock_guard<std::mutex> lock(this->m);
     listImigrants.push(_data);
+    
+    return true;
 }
diff --git a/smp/src/island.h b/smp/src/island.h
index 68c0d28c6..9e8e30edd 100644
--- a/smp/src/island.h
+++ b/smp/src/island.h
@@ -34,6 +34,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <vector>
 #include <utility>
 #include <atomic>
+#include <future>
 #include <type_traits>
 #include <algorithm>
 
@@ -113,7 +114,7 @@ public:
      * Update the list of imigrants.
      * @param _data Elements to integrate in the main population.
      */
-    void update(eoPop<bEOT> _data);
+    bool update(eoPop<bEOT> _data);
     
     /**
      * Check if the algorithm is stopped.
@@ -148,7 +149,7 @@ protected:
     IntPolicy<EOT>& intPolicy;
     MigPolicy<EOT>& migPolicy;
     std::atomic<bool> stopped;
-    std::vector<std::thread> sentMessages;
+    std::vector<std::shared_future<bool>> sentMessages;
     IslandModel<bEOT>* model;
     std::function<EOT(bEOT&)> convertFromBase; 
     std::function<bEOT(EOT&)> convertToBase;
diff --git a/smp/src/islandModel.cpp b/smp/src/islandModel.cpp
index 439dc0afd..597818bd2 100644
--- a/smp/src/islandModel.cpp
+++ b/smp/src/islandModel.cpp
@@ -98,7 +98,7 @@ void paradiseo::smp::IslandModel<EOT>::operator()()
    
     // Wait the end of messages sending
     for(auto& message : sentMessages)
-        message.join();
+        message.wait();
         
     // Clear the sentMessages container
     sentMessages.clear();
@@ -119,10 +119,12 @@ void paradiseo::smp::IslandModel<EOT>::operator()()
 }
 
 template<class EOT>  
-void paradiseo::smp::IslandModel<EOT>::update(eoPop<EOT> _data, AIsland<EOT>* _island)
+bool paradiseo::smp::IslandModel<EOT>::update(eoPop<EOT> _data, AIsland<EOT>* _island)
 {
     std::lock_guard<std::mutex> lock(m);
     listEmigrants.push(std::pair<eoPop<EOT>,AIsland<EOT>*>(_data, _island));
+    
+    return true;
 }
 
 template<class EOT>  
@@ -154,11 +156,17 @@ void paradiseo::smp::IslandModel<EOT>::send(void)
         
         // Send elements to neighbors
         eoPop<EOT> migPop = std::move(listEmigrants.front().first);
+        sentMessages.erase(std::remove_if(sentMessages.begin(), sentMessages.end(), 
+            [&](std::shared_future<bool>& i) -> bool
+            { return i.wait_for(std::chrono::nanoseconds(0)) == std::future_status::ready; }
+            ), 
+            sentMessages.end());
         for (unsigned idTo : neighbors)
-            sentMessages.push_back(std::thread(&AIsland<EOT>::update, table.getRight()[idTo], std::move(migPop))); 
+            sentMessages.push_back(std::async(std::launch::async, &AIsland<EOT>::update, table.getRight()[idTo], std::move(migPop))); 
              
         listEmigrants.pop();
     }
+
 }
 
 template<class EOT>     
diff --git a/smp/src/islandModel.h b/smp/src/islandModel.h
index 11e98c3c9..1b76550d2 100644
--- a/smp/src/islandModel.h
+++ b/smp/src/islandModel.h
@@ -33,6 +33,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <queue>
 #include <algorithm>
 #include <utility>
+#include <future>
 #include <thread>
 
 #include <bimap.h>
@@ -71,7 +72,7 @@ public:
     /**
      * Update the island model by adding population to send in the emigrants list.
      */
-    void update(eoPop<EOT> _data, AIsland<EOT>* _island);
+    bool update(eoPop<EOT> _data, AIsland<EOT>* _island);
     
     /**
      * Change topology
@@ -99,7 +100,7 @@ protected:
     Bimap<unsigned, AIsland<EOT>*> table;
     std::vector<std::pair<AIsland<EOT>*, bool>> islands;
     AbstractTopology& topo;
-    std::vector<std::thread> sentMessages;
+    std::vector<std::shared_future<bool>> sentMessages;
     std::mutex m;
     std::atomic<bool> running;
 };