Many changes for new version.