Changed constants
Merge with stash