Better flow control