Changes from uspatial