Implemented new flow analysis