new version from scatch to try
remove junk