update to use SpatialTools