Finalized the new version