diff --git a/src/Parallel/Exchange.jl b/src/Parallel/Exchange.jl
index fda83b6..2c3861c 100644
--- a/src/Parallel/Exchange.jl
+++ b/src/Parallel/Exchange.jl
@@ -757,6 +757,51 @@ function ExchangeData3DSend(U,Exchange)
     @views MPI.Isend(SendBuffer3[iP][1:nz,:,1:nT], iP - 1, tag, MPI.COMM_WORLD, sreq[i])
   end
 end
+function ExchangeData3DSendGPU(U,Exchange)
+
+  IndSendBuffer = Exchange.IndSendBuffer
+  IndRecvBuffer = Exchange.IndRecvBuffer
+  NeiProc = Exchange.NeiProc
+  Proc = Exchange.Proc
+  ProcNumber = Exchange.ProcNumber
+  nz = size(U,1)
+  nT = size(U,3)
+  RecvBuffer3 = Exchange.RecvBuffer3
+  SendBuffer3 = Exchange.SendBuffer3
+  rreq = Exchange.rreq
+  sreq = Exchange.sreq
+
+  group = (Nz,5,1)
+  KExchangeData3DSendKernel! = ExchangeData3DSendKernel!(group)
+  @inbounds for iP in NeiProc
+    ndrange = (Nz,length(IndSendBuffer[iP]),nT)
+    KExchangeData3DSendKernel!(U,SendBuffer3[iP],IndSendBuffer[iP],ndrange)
+  end
+
+  i = 0
+  @inbounds for iP in NeiProc
+    tag = Proc + ProcNumber*iP
+    i += 1
+    @views MPI.Irecv!(RecvBuffer3[iP][1:nz,:,1:nT], iP - 1, tag, MPI.COMM_WORLD, rreq[i])
+  end  
+  i = 0
+  @inbounds for iP in NeiProc
+    tag = iP + ProcNumber*Proc
+    i += 1
+    @views MPI.Isend(SendBuffer3[iP][1:nz,:,1:nT], iP - 1, tag, MPI.COMM_WORLD, sreq[i])
+  end
+end
+
+@kernel function ExchangeData3DSendKernel!(U,SendBuffer,IndSendBuffer)
+
+  Iz,I,IT = @index(Global, NTuple)
+  NumInd = @uniform @ndrange()[2]
+  NT = @uniform @ndrange()[2]
+  if I <= NumInd && IT <= NT
+    @inbounds Ind = IndSendBuffer[I]    
+    @inbounds SendBuffer[Iz,I,IT] = U[Iz,Ind,IT]
+  end  
+end
 
 function ExchangeData3DRecv!(U,p,Exchange)
 
@@ -829,14 +874,14 @@ function ExchangeData3DRecvGPU!(U,Exchange)
   end
 end  
 
-@kernel function ExchangeData3DRecvKernel!(U,Exchange)
+@kernel function ExchangeData3DRecvKernel!(U,RecvBuffer,IndRecvBuffer)
 
   Iz,I,IT = @index(Global, NTuple)
   NumInd = @uniform @ndrange()[2]
   NT = @uniform @ndrange()[2]
   if I <= NumInd && IT <= NT
     @inbounds Ind = IndRecvBuffer[I]    
-    U[Iz,Ind,IT] += RecvBuffer3[iP][Iz,I,IT]
+    @inbounds @atomic U[Iz,Ind,IT] += RecvBuffer[Iz,I,IT]
   end  
 end