changes made based on feedback