Changes suggested by Cate