trimming names
removing some debugging
release candidate 3