Reworked the design.