Updating with final version