Diagram improved