refactored spatial model