No more buffer piping
Taking null buffers in count