updated to use the new vectors