Update after code review and retest