updating with configurable location, duh
merge resolved