diff --git a/core-buffer/include/SFWriter.hpp b/core-buffer/include/SFWriter.hpp
index fca8b4b..babe53f 100644
--- a/core-buffer/include/SFWriter.hpp
+++ b/core-buffer/include/SFWriter.hpp
@@ -4,14 +4,14 @@
 #include <memory>
 #include <string>
 #include <H5Cpp.h>
-#include "RingBuffer.hpp"
+#include "buffer_config.hpp"
 
 struct DetectorFrame
 {
-    uint64_t pulse_id;
-    uint64_t frame_index;
-    uint32_t daq_rec;
-    uint16_t n_received_packets;
+    uint64_t pulse_id[core_buffer::WRITER_N_FRAMES_BUFFER];
+    uint64_t frame_index[core_buffer::WRITER_N_FRAMES_BUFFER];
+    uint32_t daq_rec[core_buffer::WRITER_N_FRAMES_BUFFER];
+    uint16_t n_received_packets[core_buffer::WRITER_N_FRAMES_BUFFER];
 };
 
 class SFWriter {
diff --git a/core-buffer/src/SFWriter.cpp b/core-buffer/src/SFWriter.cpp
index 05c6db5..fca7a60 100644
--- a/core-buffer/src/SFWriter.cpp
+++ b/core-buffer/src/SFWriter.cpp
@@ -1,5 +1,6 @@
 #include "SFWriter.hpp"
-#include "buffer_config.hpp"
+#include <sstream>
+#include "date.h"
 
 extern "C"
 {
@@ -81,39 +82,24 @@ void SFWriter::write(const DetectorFrame* metadata, const char* data) {
     auto daq_rec = metadata->daq_rec;
     auto n_received_packets = metadata->n_received_packets;
 
-//    hsize_t buff_dim[2] = {n_modules_*MODULE_Y_SIZE, MODULE_X_SIZE};
-//    H5::DataSpace buffer_space (2, buff_dim);
-//
-//    hsize_t disk_dim[3] = {n_frames_, n_modules_*MODULE_Y_SIZE, MODULE_X_SIZE};
-//    H5::DataSpace disk_space(3, disk_dim);
-//
-//    hsize_t count[] = {1, n_modules_*MODULE_Y_SIZE, MODULE_X_SIZE};
-//    hsize_t start[] = {current_write_index_, 0, 0};
-//    disk_space.selectHyperslab(H5S_SELECT_SET, count, start);
-//
-//    image_dataset_.write(data, H5::PredType::NATIVE_UINT16,
-//            buffer_space,
-//            disk_space);
+    hsize_t image_offset[] = {current_write_index_, 0, 0};
 
+    if( H5DOwrite_chunk(
+            image_dataset_.getId(),
+            H5P_DEFAULT,
+            0,
+            image_offset,
+            MODULE_N_BYTES * n_modules_ * WRITER_N_FRAMES_BUFFER,
+            data))
+    {
+        stringstream error_message;
+        using namespace date;
+        error_message << "[" << std::chrono::system_clock::now() << "]";
+        error_message << "Error while writing data to file at offset ";
+        error_message << current_write_index_ << "." << endl;
 
-        hsize_t offset[] = {current_write_index_, 0, 0};
+        throw runtime_error(error_message.str());
+    }
 
-        if( H5DOwrite_chunk(
-                image_dataset_.getId(),
-                H5P_DEFAULT,
-                0,
-                offset,
-                MODULE_N_BYTES * n_modules_ * WRITER_N_FRAMES_BUFFER,
-                data))
-        {
-            stringstream error_message;
-            using namespace date;
-            error_message << "[" << std::chrono::system_clock::now() << "]";
-            error_message << "Error while writing data to file at offset ";
-            error_message << current_write_index_ << "." << endl;
-
-            throw runtime_error(error_message.str());
-        }
-
-        current_write_index_ += 1;
+    current_write_index_ += WRITER_N_FRAMES_BUFFER;
 }