changes based on feedback
8 files changed