updated after trade show
Merge branch 'design'