changes after last code review