Incorporate broder code review number 2: