rewrite organisation, put diags next to each other