Revamp diagrams