Update Vectorization and Demo