pre spatial package re-re-re-refactoring