Changes suggested by Chris