change some according to reviewer 2