Chore/brauer changes

Merge Brauer's copy changes into master