Preparing for the new version