new version without crap