diff --git a/Sources/Redis/Client.swift b/Sources/Redis/Client.swift
index cb34e4b..ec04314 100644
--- a/Sources/Redis/Client.swift
+++ b/Sources/Redis/Client.swift
@@ -31,7 +31,7 @@ public final class Client<StreamType: DuplexStream> {
     public func command(_ command: Command, _ params: [Bytes] = []) throws -> Data? {
         let query = format(command, params)
         try serializer.serialize(query)
-        try serializer.flush()
+
         let res = try parser.parse()
         if let data = res, case .error(let e) = data {
             throw e
diff --git a/Sources/Redis/Pipeline.swift b/Sources/Redis/Pipeline.swift
index 2036d06..4bb9c68 100644
--- a/Sources/Redis/Pipeline.swift
+++ b/Sources/Redis/Pipeline.swift
@@ -22,8 +22,6 @@ public class Pipeline<StreamType: DuplexStream> {
             throw RedisError.pipelineCommandsRequired
         }
 
-        try client.serializer.flush()
-
         var responses: [Data?] = []
         for _ in 0..<queuedCommands {
             let data = try client.parser.parse()
diff --git a/Sources/Redis/Serializer.swift b/Sources/Redis/Serializer.swift
index 06f0a57..b2fab00 100644
--- a/Sources/Redis/Serializer.swift
+++ b/Sources/Redis/Serializer.swift
@@ -11,11 +11,7 @@ public final class Serializer<StreamType: DuplexStream> {
     /// the Serializer's stream
     public func serialize(_ r: Data) throws {
         let bytes = makeBytes(from: r)
-        try stream.write(bytes)
-    }
-
-    public func flush() throws {
-        try stream.flush()
+        _ = try stream.write(bytes)
     }
 
     /// Convert the Redis Data into bytes
diff --git a/Sources/Redis/StreamBuffer.swift b/Sources/Redis/StreamBuffer.swift
index 98cb562..b1ed107 100644
--- a/Sources/Redis/StreamBuffer.swift
+++ b/Sources/Redis/StreamBuffer.swift
@@ -13,7 +13,6 @@ final class StreamBuffer<Stream: DuplexStream>: DuplexStream {
     private let size: Int
     
     private var readIterator: IndexingIterator<[Byte]>
-    private var writeBuffer: Bytes
     
     var isClosed: Bool {
         return stream.isClosed
@@ -33,7 +32,6 @@ final class StreamBuffer<Stream: DuplexStream>: DuplexStream {
         self.stream = stream
         
         readIterator = Bytes().makeIterator()
-        writeBuffer = []
     }
     
     /// Reads the next byte from the buffer
@@ -89,14 +87,12 @@ final class StreamBuffer<Stream: DuplexStream>: DuplexStream {
     }
     
     /// write bytes to the buffer stream
-    func write(_ bytes: Bytes) throws {
-        writeBuffer += bytes
+    func write(_ bytes: Bytes) throws -> Int {
+        return try write(max: bytes.count, from: bytes)
     }
-    
-    func flush() throws {
-        guard !writeBuffer.isEmpty else { return }
-        try stream.write(writeBuffer)
-        try stream.flush()
-        writeBuffer = []
+
+    func write(max: Int, from buffer: Bytes) throws -> Int {
+        return try stream.write(max: max, from: buffer)
     }
+
 }