Use the correct format
Move out the generation of the vectors