Added logic for other locations with no other location specified