more updates to location management