Updated to use Vectors instead of "Location"