Added locations and vector3D