New version of staging & demo diagrams