Diagram almost done