diff --git a/servers/su/cli b/servers/su/cli
index 945df49be..3bfa220a6 100755
Binary files a/servers/su/cli and b/servers/su/cli differ
diff --git a/servers/su/src/domain/clients/uploader.rs b/servers/su/src/domain/clients/uploader.rs
index fae253fce..7cc435d62 100644
--- a/servers/su/src/domain/clients/uploader.rs
+++ b/servers/su/src/domain/clients/uploader.rs
@@ -137,7 +137,7 @@ impl Uploader for UploaderClient {
             let mut delay = Duration::from_secs(1);
             let max_delay = Duration::from_secs(32);
 
-            let bundle_item = match bytes::DataItem::from_bytes(tx_for_cache.clone()) {
+            let target_item = match bytes::DataItem::from_bytes(tx_for_cache.clone()) {
                 Ok(item) => item,
                 Err(e) => {
                     logger_for_cache.error(
@@ -147,40 +147,19 @@ impl Uploader for UploaderClient {
                 }
             };
 
-            let bundle_bytes = match bundle_item.data_bytes() {
-                Some(bytes) => bytes,
-                None => {
-                    logger_for_cache.error(
-                      "Cache upload failed bundle item has no data bytes".to_string()
-                    );
-                    return;
-                }
-            };
-
-            let bundle = match bytes::DataBundle::from_bytes(&bundle_bytes) {
-                Ok(bundle) => bundle,
-                Err(e) => {
-                    logger_for_cache.error(format!("Cache upload failed to parse data bundle: {:?}", e));
-                    return;
-                }
-            };
-
-            let target_item = match bundle.items
-                .into_iter()
-                .find(|item| {
-                    item.tags().iter().any(|tag| {
+            match target_item.tags()
+                .iter().any(|tag| {
                         tag.name == "Type" && (tag.value == "Process")
-                    })
                 }) {
-                  Some(item) => item,
-                  None => {
-                      logger_for_cache.log(
-                        "Cache upload skipping, not a Process"
-                        .to_string()
-                      );
-                      return;
-                  }
-            };
+                    true => (),
+                    false => {
+                        logger_for_cache.log(
+                            "Cache upload skipping, not a Process"
+                            .to_string()
+                        );
+                        return;
+                    }
+                };
 
             let tx_for_cache_parsed = match target_item.as_bytes() {
                 Ok(bytes) => bytes,
diff --git a/servers/su/src/domain/core/flows.rs b/servers/su/src/domain/core/flows.rs
index 2e8c2e0b3..678627cc9 100644
--- a/servers/su/src/domain/core/flows.rs
+++ b/servers/su/src/domain/core/flows.rs
@@ -603,6 +603,9 @@ pub async fn write_item(
 
             let aid = assignment.id();
             let did = data_item.id();
+            let assignment_bytes = assignment
+                .as_bytes()
+                .map_err(|e| format!("{:?}", e))?;
             let build_result = builder.bundle_items(vec![assignment, data_item]).await?;
 
             let process = Process::from_bundle(&build_result.bundle)?;
@@ -613,7 +616,8 @@ pub async fn write_item(
                 .commit(&mut *schedule_info, &next_schedule_info, did, aid);
             drop(schedule_info);
 
-            upload(&deps, build_result.binary.to_vec()).await?;
+            upload(&deps, input).await?;
+            upload(&deps, assignment_bytes).await?;
 
             return id_res(&deps, process.process.process_id.clone(), start_top_level);
         } else {
@@ -690,6 +694,9 @@ pub async fn write_item(
             None => None,
         };
 
+        let assignment_bytes = assignment
+            .as_bytes()
+            .map_err(|e| format!("{:?}", e))?;
         let build_result = builder.bundle_items(vec![assignment, data_item]).await?;
         let message = Message::from_bundle(&build_result.bundle)?;
 
@@ -708,7 +715,8 @@ pub async fn write_item(
             .commit(&mut *schedule_info, &next_schedule_info, dtarget, aid);
         drop(schedule_info);
 
-        upload(&deps, build_result.binary.to_vec()).await?;
+        upload(&deps, input).await?;
+        upload(&deps, assignment_bytes).await?;
         return id_res(&deps, message.message_id()?, start_top_level);
     } else {
         return Err("Type tag not present".to_string());
diff --git a/servers/su/src/main.rs b/servers/su/src/main.rs
index 7572e5828..58209d4a9 100644
--- a/servers/su/src/main.rs
+++ b/servers/su/src/main.rs
@@ -26,7 +26,7 @@ struct FromTo {
     to: Option<String>,
     limit: Option<i32>,
     #[serde(rename = "process-id")]
-    process_id: Option<String>,
+    process_id: String,
     #[serde(rename = "from-nonce")]
     from_nonce: Option<String>,
     #[serde(rename = "to-nonce")]
diff --git a/servers/su/su b/servers/su/su
index 3ea8708d2..bc1e066d5 100755
Binary files a/servers/su/su and b/servers/su/su differ