change some according to reviewer 1