Update code with design changes from meeting