new version without old stuff.