Improve the design.