Adding the final version