Changes suggested by Conrad