incorporating all feedback since last review