Design update

We already talked about this so I'll go ahead and merge ...