diff --git a/codex/proof/datasampler.nim b/codex/proof/datasampler.nim
index 97b823dd..1f5573fd 100644
--- a/codex/proof/datasampler.nim
+++ b/codex/proof/datasampler.nim
@@ -146,7 +146,7 @@ proc getProofInput*(self: DataSampler, challenge: FieldElement, nSamples: int):
   var
     slotToBlockProofs: seq[MerkleProof]
     blockToCellProofs: seq[MerkleProof]
-    sampleData: seq[byte]
+    samples: seq[ProofSample]
 
   let slotCellIndices = self.findSlotCellIndices(challenge, nSamples)
 
@@ -175,7 +175,14 @@ proc getProofInput*(self: DataSampler, challenge: FieldElement, nSamples: int):
     blockToCellProofs.add(cellProof)
 
     let cell = self.getCellFromBlock(blk, slotCellIndex)
-    sampleData = sampleData & cell
+
+    proc combine(bottom: MerkleProof, top: MerkleProof): MerkleProof =
+      return bottom
+
+    samples.add(ProofSample(
+      cellData: cell,
+      merkleProof: combine(cellProof, blockProof)
+    ))
 
   trace "Successfully collected proof input"
   success(ProofInput(
@@ -186,9 +193,5 @@ proc getProofInput*(self: DataSampler, challenge: FieldElement, nSamples: int):
     datasetSlotIndex: self.datasetSlotIndex,
     slotRoot: self.slotRootHash,
     datasetToSlotProof: self.datasetToSlotProof,
-    #proofSamples: yeah!
-
-    # slotToBlockProofs: slotToBlockProofs,
-    # blockToCellProofs: blockToCellProofs,
-    # sampleData: sampleData
+    proofSamples: samples
   ))
diff --git a/tests/codex/proof/testdatasampler.nim b/tests/codex/proof/testdatasampler.nim
index 9b67ba78..ac85ca8b 100644
--- a/tests/codex/proof/testdatasampler.nim
+++ b/tests/codex/proof/testdatasampler.nim
@@ -272,16 +272,15 @@ asyncchecksuite "Test proof datasampler - main":
       nSamples = 3
       input = (await dataSampler.getProofInput(challenge, nSamples)).tryget()
 
+    proc equal(a: FieldElement, b: FieldElement): bool =
+      a.toDecimal() == b.toDecimal()
+
     proc toStr(proof: MerkleProof): string =
       toHex(proof.nodesBuffer)
 
     let
-      expectedSlotToBlockProofs = getExpectedSlotToBlockProofs()
-      expectedBlockToCellProofs = getExpectedBlockToCellProofs()
-      expectedSampleData = getExpectedSampleData()
-
-    proc equal(a: FieldElement, b: FieldElement): bool =
-      a.toDecimal() == b.toDecimal()
+      expectedMerkleProofs = getExpectedSlotToBlockProofs()
+      expectedCellData = getExpectedCellData()
 
     check:
       # datasetRoot*: FieldElement
@@ -299,9 +298,13 @@ asyncchecksuite "Test proof datasampler - main":
       # datasetToSlotProof*: MerkleProof
       input.datasetToSlotProof == datasetToSlotProof
       # proofSamples*: seq[ProofSample]
-      # yeah
-
-
+      toStr(input.proofSamples[0].merkleProof) == expectedMerkleProofs[0]
+      toStr(input.proofSamples[1].merkleProof) == expectedMerkleProofs[1]
+      toStr(input.proofSamples[2].merkleProof) == expectedMerkleProofs[2]
+      # cell data
+      toHex(input.proofSamples[0].cellData) == expectedCellData[0]
+      toHex(input.proofSamples[1].cellData) == expectedCellData[1]
+      toHex(input.proofSamples[2].cellData) == expectedCellData[2]
 
       # input.slotToBlockProofs.mapIt(toStr(it)) == expectedSlotToBlockProofs
       # input.blockToCellProofs.mapIt(toStr(it)) == expectedBlockToCellProofs
diff --git a/tests/codex/proof/testdatasampler_expected.nim b/tests/codex/proof/testdatasampler_expected.nim
index 189dbb72..43fa699c 100644
--- a/tests/codex/proof/testdatasampler_expected.nim
+++ b/tests/codex/proof/testdatasampler_expected.nim
@@ -3,21 +3,23 @@
 import std/strutils
 import pkg/codex/proof/types
 
+# proc getExpectedBlockToCellProofs*(): seq[string] =
+#   @[
+#     "43AAA4A0B89548E8694C5C266BEBCC7BD0758F25005E606EDF559536D2227A7261CD0E8636D0CA8B899A070ABA5D9F815C6678877FAF71B984F5CF15300357E1C4C4A35D47EB0BECF6FB31E6C33CDB8A04D7EA0B29C2021678361F27CFBC96B355B36B13CC749463F14A7A0452A2F765E5951547B16CFB53D3824888226EE5D7FDB433239D7F55029C2C97C635A6B1214D1257C7D85C1C649758BA1AF8700E24",
+#     "F5D40D9722D943D936AF8EFDE070C5E5D8BD0EC57A89F7BF0AA864DCD8BC77D9D8BC10DDDEB897A82318994242DCF2E07BC631B063DD6F9D4D13133FDED2127DC5840256978CA55F93AF0D6C730660813CF6A29C9B0C0153C8E01D152196A03E94AF1258C023CC638A060314259FA97B5CB743CBCE7AA483839BEA37DB71DF97C4F0DD83C0F38D791C75A1406EC9CFC212E7B302508CDD5780728B55CD5F132E",
+#     "BB4E5BB9F2E0E104F04E2F49D8D39A9259C1419252A0B1150D9F0FE077A2A2258F594C0DC1A29099A3E3AAEB21C0BF00823383FC06F8A09C25462FC2DA11D51EAD968AA8200FBEA0A62FA1F83A46B3EA5D24859FF028351BEB15EA4D94F987D0CCD48366D7038EF9B0BD35FE287E111DB85A19F0E82E93CB9D40423776164D72332992C2849E7EF3AC7685A8DB37F3C44EFF9366BFE3F5FD80AF2B047C62E4A0"
+#   ]
+
 proc getExpectedSlotToBlockProofs*(): seq[string] =
   @[
-    "6ABAF89654125BBA9B99CA2635D605167D27D89641CE7E4ECF4F08E898C669B8DB784CEC822621E2DCB502F0135D48FEBACB228379FAC5ED295ED9F7A369107C",
-    "AD85DD1D1A218A253DAF27CC7874E63C162838C7F8D676F0689212D7C3A5E2EADB784CEC822621E2DCB502F0135D48FEBACB228379FAC5ED295ED9F7A369107C",
-    "BB8629AA6FF8B5818A2A3C260CB3F028E5E61DC9819DD415B168194736E23229B77FD63AEB6A517F5AE514C8A9CCBAFED5500E595572018ECC9C4205F06140E8"
+    "9863C3BE0A21CC49A03E3E7B4A134CBBE1F7A241EB61BFAE7478080A4B84E338EC99F9EE1D95A2F6126CE5FD7476E85790A95E03F4D9B63B827854CFF55F1E5236CA91969A70839AF19329616627803B29EA52185FFA8AE50FCC84C0BA8C69C4BA43F4397D2D50DD2982EDC3AF08E4762F34958645DC4749265DA9FC89874A86FFCEAB3B21F48386C75FCDA49656FE73F15C0E4AEE84479A880CA74817861A93",
+    "1F6B7B8B46ACE123F53BBFBF96999B7EED1A4F07D2BA2831AF8855B312260D39D4E9996BD5F7FD83E293168DEC32B57AD08A54D38A748DD46FD21D2685A194087237F6493DD03FBA989C356E9BD35CF1E833E66E6FF06C212FF5FCB603E59AA762A338CE5CE3BD68D68E4A4A6C799FF935F3829085C86E07A12B27278E7A5AAD77CDFAD51D9B8B13C44646E01450D2140924211CBE62520B7C4916C4E4C955F5",
+    "F2972FCDA69A1FF6B71BD487618FF1AB871C4D4861724F1B01574E414EB3C1D761CD0E8636D0CA8B899A070ABA5D9F815C6678877FAF71B984F5CF15300357E1C4C4A35D47EB0BECF6FB31E6C33CDB8A04D7EA0B29C2021678361F27CFBC96B355B36B13CC749463F14A7A0452A2F765E5951547B16CFB53D3824888226EE5D7FDB433239D7F55029C2C97C635A6B1214D1257C7D85C1C649758BA1AF8700E24"
   ]
 
-proc getExpectedBlockToCellProofs*(): seq[string] =
+proc getExpectedCellData*(): seq[string] =
   @[
-    "43AAA4A0B89548E8694C5C266BEBCC7BD0758F25005E606EDF559536D2227A7261CD0E8636D0CA8B899A070ABA5D9F815C6678877FAF71B984F5CF15300357E1C4C4A35D47EB0BECF6FB31E6C33CDB8A04D7EA0B29C2021678361F27CFBC96B355B36B13CC749463F14A7A0452A2F765E5951547B16CFB53D3824888226EE5D7FDB433239D7F55029C2C97C635A6B1214D1257C7D85C1C649758BA1AF8700E24",
-    "F5D40D9722D943D936AF8EFDE070C5E5D8BD0EC57A89F7BF0AA864DCD8BC77D9D8BC10DDDEB897A82318994242DCF2E07BC631B063DD6F9D4D13133FDED2127DC5840256978CA55F93AF0D6C730660813CF6A29C9B0C0153C8E01D152196A03E94AF1258C023CC638A060314259FA97B5CB743CBCE7AA483839BEA37DB71DF97C4F0DD83C0F38D791C75A1406EC9CFC212E7B302508CDD5780728B55CD5F132E",
-    "BB4E5BB9F2E0E104F04E2F49D8D39A9259C1419252A0B1150D9F0FE077A2A2258F594C0DC1A29099A3E3AAEB21C0BF00823383FC06F8A09C25462FC2DA11D51EAD968AA8200FBEA0A62FA1F83A46B3EA5D24859FF028351BEB15EA4D94F987D0CCD48366D7038EF9B0BD35FE287E111DB85A19F0E82E93CB9D40423776164D72332992C2849E7EF3AC7685A8DB37F3C44EFF9366BFE3F5FD80AF2B047C62E4A0"
+    "CA".repeat(CellSize),
+    "A9".repeat(CellSize),
+    "B3".repeat(CellSize)
   ]
-
-proc getExpectedSampleData*(): string =
-  "B2".repeat(CellSize) &
-  "95".repeat(CellSize) &
-  "EE".repeat(CellSize)