changes during code review with Adam