updated location helper