Updated design.
Merge branch 'design_testing'