updated location hierarchy