Brushing up design some more.