updated to work with changes in Vector API