Dev matthieu

We must consider the performances issues as well