Updated design.
Merge.