Updated for 2nd code review