Collective changes for demo