Change the strategy to separate flow