Update of the final version