Incorporate feedback from comments.