[Design Team] #352: Task 2