Switched to vector_math