update from code review