Refactor the Vector, draw it in