setup_changes

Finally have the setup code working as I want.