Improve design