amendment 5, to squash later

- use global cluster scope
- cosmetics