made second round of changes based on feedback