Changes suggested by Bruce Schwartz