Updated with all diagrams