more cruft.  well, less now