Adjustments based on feedback from Raj