FabriceSalvaire updated setup_data