Re-added update_locations as its removal is part of another branch.