changes suggested by Cate