update location notice works
stuff
Merge branch 'update_location'