More stripping and changes