Last version of the code + update doc