Made the last change of the final version