spatial data structure
models
merge fix