Fixed bufferData
Updates