Tries to improve Jeff's proposal.
Minor corrections.