Changes based on feedback from the community.