change order and location tables/core