diff --git a/1_fetch.R b/1_fetch.R
index b3d99a9b991d2aadabcced1152905a7b774f09a7..810731704e67f75d30dad0981b75bdeff9930948 100644
--- a/1_fetch.R
+++ b/1_fetch.R
@@ -2,19 +2,21 @@ source("1_fetch/src/fetch_utils.R")
 
 p1_targets <- list(
   ##### Vulnerability indicators data #####
+  tar_target(p1_out_data,
+             "1_fetch/out/"),
   tar_target(p1_sb_id,
              '63f79d49d34e4f7eda456572'),
   ##### Vulnerability indicators metadata #####
   tar_target(p1_vul_ind_xml,
-             download_from_sb(sb_id = p1_sb_id,
-                              filename = 'Uncertainty_Summary.xml',
-                              dest_dir = '1_fetch/out'),
+             sb_initialize_and_download(sb_id = p1_sb_id,
+                              names = 'Uncertainty_Summary.xml',
+                              destinations = paste0(p1_out_data, "Uncertainty_Summary.xml")),
              format = 'file'),
   ##### Uncertainty statistics for the indicators #####
   tar_target(p1_unc_stats_csv,
-             download_from_sb(sb_id = p1_sb_id,
-                              filename = 'Uncertainty_Summary.csv',
-                              dest_dir = '1_fetch/out'),
+             sb_initialize_and_download(sb_id = p1_sb_id,
+                              names = 'Uncertainty_Summary.csv',
+                              destinations = paste0(p1_out_data, "Uncertainty_Summary.csv")),
              format = 'file'),
   tar_target(p1_unc_stats,
              readr::read_csv(p1_unc_stats_csv) |> 
@@ -40,23 +42,20 @@ p1_targets <- list(
                filter(group %in% c('CONUS')) |> 
                rmapshaper::ms_simplify(keep = 0.2) |> 
                filter(NAME %in% p1_census_states)),
-  tar_target(p1_out_data,
-             "1_fetch/out"),
   # raster data for population density
-  tar_target(p1_pop_density_raster,
-             '1_fetch/in/gpw-v4-population-count-rev11_2020_30_sec_tif/gpw_v4_population_count_rev11_2020_30_sec.tif'),
+  tar_target(p1_pop_density_raster_zip,
+             '1_fetch/in/gpw-v4-population-count-rev11_2020_30_sec_tif.zip'),
+  tar_target(p1_pop_density_raster_tif,
+             unzip(p1_pop_density_raster_zip, 'gpw_v4_population_count_rev11_2020_30_sec.tif',
+                   exdir = p1_out_data)),
   # raster data for impervious surfaces
-  tar_target(p1_imp_surf_rast,
-             download_from_sb(sb_id = "664e0da6d34e702fe8744579",
-                              filename = 'Annual_NLCD_FctImp_2022_CU_C1V0.zip',
-                              dest_dir = p1_out_data),
-             format = 'file'),
   tar_target(p1_imp_surf_zip,
-             '1_fetch/out/Annual_NLCD_FctImp_2022_CU_C1V0.zip'),
+             sb_initialize_and_download(sb_id = "664e0da6d34e702fe8744579",
+                              names = 'Annual_NLCD_FctImp_2022_CU_C1V0.zip',
+                              destinations = paste0(p1_out_data, "Annual_NLCD_FctImp_2022_CU_C1V0.zip")),
+             format = 'file'),
   tar_target(p1_imp_surf_tif,
              unzip(p1_imp_surf_zip, 'Annual_NLCD_FctImp_2022_CU_C1V0.tif',
-                   exdir = p1_out_data)),
-  tar_target(p1_imp_surf_tif,
-             "1_fetch/out/Annual_NLCD_FctImp_2022_CU_C1V0/Annual_NLCD_FctImp_2022_CU_C1V0.tif")
+                   exdir = p1_out_data))
   )
   
\ No newline at end of file