Diagram and annotate complete