Changes suggested by Scott.