some adjustments based on feedback.