Added flow control