Changes suggested by Fred