Incorporated suggestions from feedback.