diff --git a/lab10/jacobi/jacobi_mpi.cpp b/lab10/jacobi/jacobi_mpi.cpp
index f3e1df2..7500019 100644
--- a/lab10/jacobi/jacobi_mpi.cpp
+++ b/lab10/jacobi/jacobi_mpi.cpp
@@ -1,47 +1,145 @@
 #include "jacobi.h"
 #include "jacobi_main.h"
 
-Result JacobiMPI::run(const Matrix& init, double epsilon, int maxNumIter){
+std::vector<double> getFilledBuffer(const Matrix &matrix, int row)
+{
+  int numCols = matrix.cols();
+  std::vector<double> rowBuffer(numCols);
+
+  // Extract the row (matrix is column-major)
+  for (int j = 0; j < numCols; ++j)
+  {
+    rowBuffer[j] = matrix(row, j);
+  }
+  return rowBuffer;
+}
+
+/**
+ * Takes a matrix and an index indexRowLocal which defines which row of the local matrix has to be sent.
+ *
+ * Sends data of that row via MPI_Send to process with rank receiverRank.
+ *
+ * indexRowGlobal identifies row in the view of the whole matrix, used from receiving process
+ * to identify if lower or upper halo by comparing against rowHaloUpperIndex and rowHaloLowerIndex.
+ */
+void sendLocalRow(const Matrix &matrix, const int indexRowLocal, const int receiverRank, const int indexRowGlobal)
+{
+  std::vector<double> row = getFilledBuffer(matrix, indexRowLocal);
+  MPI_Send(row.data(), row.size(), MPI_DOUBLE, receiverRank, indexRowGlobal, MPI_COMM_WORLD);
+}
+
+Result JacobiMPI::run(const Matrix &init, double epsilon, int maxNumIter)
+{
   int rank, numProc;
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);
   MPI_Comm_size(MPI_COMM_WORLD, &numProc);
 
   std::vector<Matrix> phi(2, init);
+
   const int numRows = phi[0].rows();
   const int numCols = phi[0].cols();
-  std::vector<double> halo_up(numCols);
-  std::vector<double> halo_low(numCols);
+
+  const int neighborUpper = rank - 1;
+  const int neighborLower = rank + 1;
+
+  const int indexRowGlobalStart = (rank * numRows);
+  const int indexRowGlobalEnd = (rank * numRows) + (numRows - 1);
+
+  const int rowHaloUpperIndex = indexRowGlobalStart - 1;
+  const int rowHaloLowerIndex = indexRowGlobalEnd + 1;
+
+  std::vector<double> haloUpper(numCols);
+  std::vector<double> haloLower(numCols);
 
   double dist = std::numeric_limits<double>::max();
   int nIter = 0;
 
-  int t0 = 0;  // array index of current timestep
-  int t1 = 1;  // array index of next timestep
-  while (dist > epsilon && nIter < maxNumIter) {
+  int t0 = 0; // array index of current timestep
+  int t1 = 1; // array index of next timestep
+  while (dist > epsilon && nIter < maxNumIter)
+  {
     dist = 0;
 
     if (rank == 0)
     {
-      MPI_Send(&phi[t0][numRows - 1]);
+      sendLocalRow(phi[t0], numRows - 1, neighborLower, indexRowGlobalEnd);
 
-      for (int i = 1; i < numRows - 1; ++i) {
-        for (int j = 1; j < numCols - 1; ++j) {
-          phi[t1](i, j) = .25 * (phi[t0](i + 1, j) + phi[t0](i - 1, j) +
+      MPI_Status status;
+      MPI_Recv(haloLower.data(), haloLower.size(), MPI_DOUBLE, neighborLower, rowHaloLowerIndex, MPI_COMM_WORLD, &status);
+
+      for (int i = 1; i < numRows - 1; ++i)
+      {
+        for (int j = 1; j < numCols - 1; ++j)
+        {
+          double valueBottom;
+          (i == numRows - 1) ? valueBottom = haloLower[j] : valueBottom = phi[t0](i + 1, j);
+          phi[t1](i, j) = .25 * (valueBottom + phi[t0](i - 1, j) +
                                  phi[t0](i, j + 1) + phi[t0](i, j - 1));
           const double diff = phi[t1](i, j) - phi[t0](i, j);
           dist = std::max(dist, std::abs(diff));
         }
       }
-
     }
-    
 
-    for (int i = 1; i < numRows - 1; ++i) {
-      for (int j = 1; j < numCols - 1; ++j) {
-        phi[t1](i, j) = .25 * (phi[t0](i + 1, j) + phi[t0](i - 1, j) +
-                               phi[t0](i, j + 1) + phi[t0](i, j - 1));
-        const double diff = phi[t1](i, j) - phi[t0](i, j);
-        dist = std::max(dist, std::abs(diff));
+    else if (rank == (numProc - 1))
+    {
+      sendLocalRow(phi[t0], 0, neighborUpper, indexRowGlobalStart);
+
+      MPI_Status status;
+      MPI_Recv(haloUpper.data(), haloUpper.size(), MPI_DOUBLE, neighborUpper, rowHaloUpperIndex, MPI_COMM_WORLD, &status);
+
+      for (int i = 1; i < numRows - 1; ++i)
+      {
+        for (int j = 1; j < numCols - 1; ++j)
+        {
+          double valueTop;
+          (i == 0) ? valueTop = haloUpper[j] : valueTop = phi[t0](i - 1, j);
+          phi[t1](i, j) = .25 * (phi[t0](i + 1, j) + valueTop +
+                                 phi[t0](i, j + 1) + phi[t0](i, j - 1));
+          const double diff = phi[t1](i, j) - phi[t0](i, j);
+          dist = std::max(dist, std::abs(diff));
+        }
+      }
+    }
+
+    else
+    {
+      sendLocalRow(phi[t0], 0, neighborUpper, indexRowGlobalStart);
+      sendLocalRow(phi[t0], numRows - 1, neighborLower, indexRowGlobalEnd);
+
+      MPI_Status status;
+      MPI_Recv(haloUpper.data(), haloUpper.size(), MPI_DOUBLE, neighborUpper, rowHaloUpperIndex, MPI_COMM_WORLD, &status);
+      MPI_Status status;
+      MPI_Recv(haloLower.data(), haloLower.size(), MPI_DOUBLE, neighborLower, rowHaloLowerIndex, MPI_COMM_WORLD, &status);
+
+      for (int i = 0; i < numRows; ++i)
+      {
+        for (int j = 1; j < numCols - 1; ++j)
+        {
+          if (i == 0)
+          {
+            double valueTop = haloUpper[j];
+            phi[t1](i, j) = .25 * (phi[t0](i + 1, j) + valueTop +
+                                   phi[t0](i, j + 1) + phi[t0](i, j - 1));
+            const double diff = phi[t1](i, j) - phi[t0](i, j);
+            dist = std::max(dist, std::abs(diff));
+          }
+          else if (i == numRows - 1)
+          {
+            double valueBottom = haloLower[j];
+            phi[t1](i, j) = .25 * (valueBottom + phi[t0](i - 1, j) +
+                                   phi[t0](i, j + 1) + phi[t0](i, j - 1));
+            const double diff = phi[t1](i, j) - phi[t0](i, j);
+            dist = std::max(dist, std::abs(diff));
+          }
+          else
+          {
+            phi[t1](i, j) = .25 * (phi[t0](i + 1, j) + phi[t0](i - 1, j) +
+                                   phi[t0](i, j + 1) + phi[t0](i, j - 1));
+            const double diff = phi[t1](i, j) - phi[t0](i, j);
+            dist = std::max(dist, std::abs(diff));
+          }
+        }
       }
     }