Changes per suggestions by Alan.