new version, substantial cleanup and saner