take some of the suggestions from cypherpunks on #6892