Made modifications based on feedback