Some changes regarding flow