Updated to the final version