Enhance and simplify Flow path