diff --git a/runs/kallisto/README.md b/runs/kallisto/README.md
index f3a9d64a28da2826277c153e5794cffaa5f1bb79..65d21cd4f3ce6e4d1656367abbdf063c3302894e 100644
--- a/runs/kallisto/README.md
+++ b/runs/kallisto/README.md
@@ -4,5 +4,6 @@
 
 ```bash
 cd runs/kallisto/
-cwltool ../../workflows/kallisto/kallisto-index.cwl index.yml
-```
\ No newline at end of file
+cwltool --cachedir cache2 ../../workflows/kallisto/kallisto-workflow.cwl workflow.yml > $(date +"%Y-%m-%d_%H-%M").log 2>&1 &
+```
+
diff --git a/runs/kallisto/workflow.yml b/runs/kallisto/workflow.yml
index b21cbe8f57d1f28d620727619aba9dbf6fc55502..e1d32d5b1c395e3aceb975b84d7bc2489a7e74e8 100644
--- a/runs/kallisto/workflow.yml
+++ b/runs/kallisto/workflow.yml
@@ -1,10 +1,15 @@
-InputReads: 
+InputReadsMultipleSamples: 
+  - 
+    - class: File
+      path: ../../assays/Talinum_RNASeq_minimal/dataset/DB_097_CAMMD_CAGATC_L001_R1_001.fastq.gz
+      format: edam:format_1930 # FASTQ
+  - 
+    - class: File
+      path: ../../assays/Talinum_RNASeq_minimal/dataset/DB_099_CAMMD_CTTGTA_L001_R1_001.fastq.gz
+      format: edam:format_1930 # FASTQ
+IndexInput:
   - class: File
-    path: ../../assays/Talinum_RNASeq_minimal/dataset/DB_097_CAMMD_CAGATC_L001_R1_001.fastq.gz
-    format: edam:format_1930 # FASTQ
-InputFiles:
-  - class: File
-    path: ../../../studies/TalinumGenomeDraft/resources/Talinum.gm.CDS.nt.fa
+    path: ../../studies/TalinumGenomeDraft/resources/Talinum.gm.CDS.nt.fa
     format: edam:format_1929 # FASTA
 isSingle: true
 FragmentLength: 200
diff --git a/workflows/kallisto/kallisto-workflow.cwl b/workflows/kallisto/kallisto-workflow.cwl
index 08047cde23d3faa44767d395e9c2730690444032..37fb7dfc8908349e5b37ded7e973efd1841f3625 100644
--- a/workflows/kallisto/kallisto-workflow.cwl
+++ b/workflows/kallisto/kallisto-workflow.cwl
@@ -3,25 +3,41 @@ class: Workflow
 
 requirements:
   ScatterFeatureRequirement: {}
+  StepInputExpressionRequirement: {}
+  InlineJavascriptRequirement: {}
 
 inputs:
-  InputReads: []
-  Index: File
+  InputReadsMultipleSamples:
+    type: 
+      type: array
+      items: 
+        type: array
+        items: File
+  IndexInput: File[]
   isSingle: boolean
   FragmentLength: double?  
   StandardDeviation: double?
   BootstrapSamples: int?  
 
 steps:
+  index:
+    run: kallisto-index.cwl
+    in:
+      InputFiles: IndexInput
+      IndexName: 
+        source: IndexInput
+        valueFrom: $(self[0].nameroot)
+    out: [index]
   quant:
     run: kallisto-quant.cwl
     scatter: InputReads
     in:
-      InputReads: listFiles/inDirFiles
+      InputReads: InputReadsMultipleSamples
       QuantOutfolder:
-        source: InputReads
-        valueFrom: $(self.nameroot)
-      Index: Index
+        # source: InputReadsMultipleSamples
+        # valueFrom: $(self[0].nameroot)
+        valueFrom: testSample
+      Index: index/index
       isSingle: isSingle
       FragmentLength: FragmentLength 
       StandardDeviation: StandardDeviation