Improvements on general flow