Using globals for patching
Merge branch 'feature/Badger_Changes'

* feature/Badger_Changes:
  Using globals for patching