Vectorization revamp