Design update.

Hope it's a good one.