Preparing for new version