Added vectorization