Set up Neighborhoods
Revert to old schema
workaround 2