Improve design.