Changes suggested by Martin