+ Modified so that spatial locations are considered
+ Updated