changes in light of comments