Final adjustments of the new version