changes based on discussion