Update to final version