Minor design change
Merge branch 'story-7-task-34-bis'