Replaced 3D vectors with 2D vectors