impl. changes from code review