Updated sources w/ Tree Vectorization