Update for code review