Update of work on algo (Sorry, it's hard !)