20140405-03: update vectorization