Changes suggested by hadley