diff --git a/nodes/save_latent_s3.py b/nodes/save_latent_s3.py
index 076d31e..e7ee3f9 100644
--- a/nodes/save_latent_s3.py
+++ b/nodes/save_latent_s3.py
@@ -1,11 +1,18 @@
 import os
+import json
+import torch
+import comfy.utils
 
 from ..client_s3 import get_s3_instance
+from folder_paths import get_output_directory, get_save_image_path
+import folder_paths
+from comfy.cli_args import args
+
 S3_INSTANCE = get_s3_instance()
 
 class SaveLatentToS3:
     def __init__(self):
-        self.output_dir = folder_paths.get_output_directory()
+        self.output_dir = get_output_directory()
         self.s3_output_dir = os.getenv("S3_OUTPUT_DIR")
         self.prefix_append = ""
 
@@ -15,7 +22,7 @@ class SaveLatentToS3:
                               "filename_prefix": ("STRING", {"default": "latents/ComfyUI"})},
                 "hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"},
                 }
-    RETURN_TYPES = ("STRING")
+    RETURN_TYPES = ("STRING",)
     RETURN_NAMES = ("latent_file_path",)
     FUNCTION = "save"
 
@@ -24,7 +31,7 @@ class SaveLatentToS3:
     CATEGORY = "SaveLatentToS3"
 
     def save(self, samples, filename_prefix="ComfyUI", prompt=None, extra_pnginfo=None):
-        full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix, self.output_dir)
+        full_output_folder, filename, counter, subfolder, filename_prefix = get_save_image_path(filename_prefix, self.output_dir)
         # support save metadata for latent sharing
         prompt_info = ""
         if prompt is not None:
@@ -37,27 +44,19 @@ class SaveLatentToS3:
                 for x in extra_pnginfo:
                     metadata[x] = json.dumps(extra_pnginfo[x])
 
-        file = f"{filename}_.latent"
-
-        results: list[FileLocator] = []
-        results.append({
-            "filename": file,
-            "subfolder": subfolder,
-            "type": "output"
-        })
-
-        file = os.path.join(full_output_folder, file)
+        file = f"{filename}_{counter:05}.latent"
+        file_path = os.path.join(full_output_folder, file)
 
         output = {}
         output["latent_tensor"] = samples["samples"]
         output["latent_format_version_0"] = torch.tensor([])
 
-        comfy.utils.save_torch_file(output, file, metadata=metadata)
+        comfy.utils.save_torch_file(output, file_path, metadata=metadata)
 
-        #Upload to S3
-        full_output_folder, filename, counter, _, filename_prefix = S3_INSTANCE.get_save_path(filename_prefix)
-        s3_path = os.path.join(full_output_folder, file)
-        file_path = S3_INSTANCE.upload_file(file, s3_path)
+        # Upload to S3
+        full_output_folder_s3, filename_s3, counter_s3, _, filename_prefix_s3 = S3_INSTANCE.get_save_path(filename_prefix)
+        s3_file = f"{filename_s3}_{counter_s3:05}.latent"
+        s3_path = os.path.join(full_output_folder_s3, s3_file)
+        s3_file_path = S3_INSTANCE.upload_file(file_path, s3_path)
 
-
-        return {file_path}
+        return (s3_file_path,)