as requested per code review