refactoring for subnational export