Incorporating comments from the community.