Changes for flow control