Extended the design a little bit.