Improve the diagram