Update code based on feedback