Incorporated community feedback.