changes to structure based on feedback