Adjusted for vector_add changes