diff --git a/shaders/glsl/opmult.comp b/shaders/glsl/opmult.comp
index 69f3840b1..c60d67696 100644
--- a/shaders/glsl/opmult.comp
+++ b/shaders/glsl/opmult.comp
@@ -19,7 +19,9 @@ void main()
 {
 	uint index = gl_GlobalInvocationID.x;
 
-    valuesOutput[index] = valuesLhs[index] * valuesRhs[index];
+    //valuesOutput[index] = valuesLhs[index] * valuesRhs[index];
+    // FOR TESTING
+    valuesOutput[index] = index;
 }
 
 
diff --git a/shaders/glsl/opmult.comp.spv b/shaders/glsl/opmult.comp.spv
index 9f528214a..e8e5b653a 100755
Binary files a/shaders/glsl/opmult.comp.spv and b/shaders/glsl/opmult.comp.spv differ
diff --git a/src/OpMult.cpp b/src/OpMult.cpp
index addc7b25a..18c6d0340 100644
--- a/src/OpMult.cpp
+++ b/src/OpMult.cpp
@@ -1,4 +1,6 @@
 
+#include <chrono>
+#include <thread>
 
 #include "Tensor.hpp"
 
diff --git a/src/Tensor.cpp b/src/Tensor.cpp
index aa11676c2..d34a5e104 100644
--- a/src/Tensor.cpp
+++ b/src/Tensor.cpp
@@ -136,10 +136,11 @@ Tensor::recordCopyFrom(std::shared_ptr<Tensor> copyFromTensor)
 
 // TODO: Explore if this function should be here or expose buffer
 vk::DescriptorBufferInfo Tensor::constructDescriptorBufferInfo() {
+    vk::DeviceSize bufferSize = this->memorySize();
     return vk::DescriptorBufferInfo(
         *this->mBuffer,
         0, // offset
-        VK_WHOLE_SIZE
+        bufferSize
     );
 }