Added modifiable location
Merged branches